diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-11-19 20:51:39 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-11-19 20:51:39 +0000 |
| commit | f44729a8764a07b07e7ab5897ae8a99f8bfe502e (patch) | |
| tree | 1a3de5c75a75486d54f97755715f04cf630cf8b0 | |
| parent | 3a957df6fb838afec9ac9eddd1bdadafa7d6b58d (diff) | |
| download | multilib-f44729a8764a07b07e7ab5897ae8a99f8bfe502e.tar.gz multilib-f44729a8764a07b07e7ab5897ae8a99f8bfe502e.tar.xz | |
gcc-multilib: do not remove static libraries in gdc package.
| -rwxr-xr-x | source/current/gcc/gcc-multilib.SlackBuild | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/current/gcc/gcc-multilib.SlackBuild b/source/current/gcc/gcc-multilib.SlackBuild index b0ebedd..b97a315 100755 --- a/source/current/gcc/gcc-multilib.SlackBuild +++ b/source/current/gcc/gcc-multilib.SlackBuild @@ -62,7 +62,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc SRCVER=${SRCVER:-"9.2.0"} VERSION=$(echo $SRCVER | cut -f 1 -d _) -BUILD=${BUILD:-3alien} +BUILD=${BUILD:-4alien} # How many jobs to run in parallel: NUMJOBS=${NUMJOBS:-"$(nproc)"} @@ -724,18 +724,20 @@ fi mkdir -p usr/lib${LIBDIRSUFFIX} mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgdruntime* usr/lib${LIBDIRSUFFIX} mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgphobos* usr/lib${LIBDIRSUFFIX} - # Don't package the (bloated) libgphobos.a or libgdruntime.a. - # As a rule, we don't package static libraries. - rm -f usr/lib${LIBDIRSUFFIX}/libgphobos.a - rm -f usr/lib${LIBDIRSUFFIX}/libgdruntime.a + ## COMMENTED OUT: defaults to static linking and that default does not + ## seem to be easlity changed... + ## Don't package the (bloated) libgphobos.a or libgdruntime.a. + ## As a rule, we don't package static libraries. + #rm -f usr/lib${LIBDIRSUFFIX}/libgphobos.a + #rm -f usr/lib${LIBDIRSUFFIX}/libgdruntime.a mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/d usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include if [ "$ARCH" = "x86_64" ]; then mkdir -p usr/lib mv $PKG1/usr/lib/libgdruntime* usr/lib mv $PKG1/usr/lib/libgphobos* usr/lib - rm -f usr/lib}/libgphobos.a - rm -f usr/lib/libgdruntime.a + #rm -f usr/lib}/libgphobos.a + #rm -f usr/lib/libgdruntime.a mkdir -p usr/lib/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib/gcc/$TARGET/$VERSION/include/d usr/lib/gcc/$TARGET/$VERSION/include fi |