From 352989cb1f59e52e8d48302b5421a7eef9cfe6de Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 25 Feb 2018 12:30:28 +0100 Subject: [PATCH 1/5] libxslt: Remove unneeded source lines --- libxslt-1.1.29-1.bee | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libxslt-1.1.29-1.bee b/libxslt-1.1.29-1.bee index 9bea8a9be..27a79e02f 100755 --- a/libxslt-1.1.29-1.bee +++ b/libxslt-1.1.29-1.bee @@ -1,17 +1,10 @@ #!/bin/env beesh -# Mon Jun 13 2016 -- kreitler - SRCURL[0]="http://xmlsoft.org/sources/libxslt-${PKGVERSION}.tar.gz" -BEE_MAKEFLAGS=${BEE_MAKEFLAGS:-' -j12 '} - -[ $UID != 0 ] && PREFIX=/dev/shm/junk - EXCLUDE="/usr/share/doc" mee_install() { - [ "x$DEE_BUG" != "x" ] && exit bee_install } From 7c851c12c7283c9f3bd36b24f4c9518b2915a1a7 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 25 Feb 2018 12:40:25 +0100 Subject: [PATCH 2/5] libxslt: Recreate with current template --- libxslt-1.1.29-1.bee | 83 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/libxslt-1.1.29-1.bee b/libxslt-1.1.29-1.bee index 27a79e02f..d66876d67 100755 --- a/libxslt-1.1.29-1.bee +++ b/libxslt-1.1.29-1.bee @@ -1,10 +1,83 @@ -#!/bin/env beesh +#!/usr/bin/env beesh + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. SRCURL[0]="http://xmlsoft.org/sources/libxslt-${PKGVERSION}.tar.gz" -EXCLUDE="/usr/share/doc" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. + +EXCLUDE+=(/usr/share/doc) + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} -mee_install() { - bee_install -} +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 1f19103f716a8c5417530bd8e05a3952419c6fb9 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 25 Feb 2018 12:42:12 +0100 Subject: [PATCH 3/5] libxslt: Convert to versionless bee file --- libxslt-1.1.29-1.bee => libxslt.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libxslt-1.1.29-1.bee => libxslt.be0 (98%) diff --git a/libxslt-1.1.29-1.bee b/libxslt.be0 similarity index 98% rename from libxslt-1.1.29-1.bee rename to libxslt.be0 index d66876d67..b0930d021 100755 --- a/libxslt-1.1.29-1.bee +++ b/libxslt.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libxslt-1.1.29-1 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 67902557ebbf88f78291dfdfba149d4bd511f4ef Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 25 Feb 2018 12:44:40 +0100 Subject: [PATCH 4/5] libxslt: Upgrade from version 1.1.29 to 1.1.32 We need to rebuild libxslt after the glibc update. Otherwise applications can no longer build against this library: cc -c -I/usr/include/libxml2 -I/usr/include/libxml2 -fwrapv -fno-strict-aliasing -pipe -fstack-protector-strong -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -O2 -DVERSION=\"1.96\" -DXS_VERSION=\"1.96\" -fPIC "-I/dev/shm/perl-5.26.1-4/lib/5.26.1/x86_64-linux/CORE" -DHAVE_BLANK -DHAVE_BLANK -DHAVE_EXSLT LibXSLT.c In file included from /usr/include/libxslt/xsltInternals.h:24:0, from LibXSLT.xs:14: /usr/include/libxslt/xsltlocale.h:20:10: fatal error: xlocale.h: No such file or directory #include ^~~~~~~~~~~ compilation terminated. xlocale.h was dropped from the newer glibc releases. When we rebuild anyway, we upgrade to latest available version. --- libxslt.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxslt.be0 b/libxslt.be0 index b0930d021..998c0da31 100755 --- a/libxslt.be0 +++ b/libxslt.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libxslt-1.1.29-1 +# BEE_VERSION libxslt-1.1.32-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From e3412ea4ff73b6a6bb440a06896469dfe9a71faf Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 25 Feb 2018 12:51:49 +0100 Subject: [PATCH 5/5] libxslt: Remove python bindings Because we are going to remove the system python, remove the python bindings. --- libxslt.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libxslt.be0 b/libxslt.be0 index 998c0da31..fe0ac8dbe 100755 --- a/libxslt.be0 +++ b/libxslt.be0 @@ -53,9 +53,9 @@ EXCLUDE+=(/usr/share/doc) # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure --without-python +} #mee_build() { # bee_build