Skip to content

Commit bf53f10

Browse files
committed
fix lucid build about libselinux
1 parent 1390e67 commit bf53f10

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

local-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ popd
1616
docker build . # next step has no log, so build first
1717
IMAGE_ID=$(docker build -q .)
1818

19-
./build.sh "$IMAGE_ID" ./build/emacs-src BUILD_GUI=gtk3 BUILD_NATIVE_COMP=no
19+
./build.sh "$IMAGE_ID" ./build/emacs-src BUILD_GUI=lucid BUILD_NATIVE_COMP=no

scripts/build_emacs_in_docker.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ if [[ "$IS_GUI" = "yes" ]]; then
4848
ARGS+=" --with-harfbuzz --with-cairo --with-libotf --without-m17n-flt"
4949
fi
5050

51-
5251
env \
5352
PATH=$DIST_APPDIR/bin:$PATH \
5453
LD_LIBRARY_PATH=$DIST_APPDIR/lib \
@@ -68,3 +67,8 @@ popd
6867

6968
cp $SCRIPT_DIR/AppRun $DIST_APPDIR/AppRun
7069
python3 $SCRIPT_DIR/postprocess.py $DIST_APPDIR
70+
71+
# https://github.com/AppImageCommunity/pkg2appimage/issues/83
72+
echo "extern int is_selinux_enabled(void){return 0;}" > /tmp/selinux-mock.c
73+
gcc-8 -s -shared -o /tmp/libselinux.so.1 -Wl,-soname,libselinux.so.1 /tmp/selinux-mock.c
74+
mv /tmp/libselinux.so.1 ${DIST_APPDIR}/lib/

scripts/postprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def _parse_node(node, expected_level):
190190
for name in LIB_BLACKLIST:
191191
trimmed_names = lddtree.trim(name)
192192
for trimmed_name in trimmed_names:
193-
logging.warning(f'Removed lib {trimmed_name}')
193+
logging.warning(f'Removed lib {trimmed_name} (due to {name})')
194194
lddtree.trim(trimmed_name)
195195

196196
for name, libpath in lddtree.collect().items():

0 commit comments

Comments
 (0)