Browse Source

musl: enhanced to build a libssp so the one from gcc is not needed.

master
Nagy Károly Gábriel 9 years ago
parent
commit
565baddd63
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      base/musl/musl.conf

+ 7
- 2
base/musl/musl.conf

@ -47,8 +47,13 @@ musl_postinstall() {
}
musl_make_utils() {
# build minimal libssp_nonshared.a so we don't need libssp from gcc
# comes from Alpine Linux
gcc $CPPFLAGS $CFLAGS -c $confdir/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
$AR r libssp_nonshared.a __stack_chk_fail_local.o
cp -a libssp_nonshared.a $root/$libdir/
# getent is needed by OpenSDE framework.
$CC $CPPFLAGS $CFLAGS $confdir/getent.c -o $root/$sbindir/getent
gcc $CPPFLAGS $CFLAGS $confdir/getent.c -o $root/$sbindir/getent
}
# if musl is default libc
@ -60,7 +65,7 @@ if [ "$SDECFG_LIBC" == "musl" ]; then
hook_add postinstall 5 'musl_postinstall'
fi
hook_add postflist 9 "rm -rf $root/$includedir/libintl.h"
hook_add postmake 5 'musl_make_utils'
hook_add postpatch 5 'musl_make_utils'
fi
# always install the headers even if already present in the sandbox

Loading…
Cancel
Save