From 8b74b50bb864ad4c040e3fe8888598ba85216ca0 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 23 Aug 2021 10:25:21 +0200 Subject: [PATCH] glib-1: satisfy autotools 1.6 - remove now failing patches - add arch patch for autotools - autoreconf stuff --- glib.be0 | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/glib.be0 b/glib.be0 index 139703716..485745e2d 100755 --- a/glib.be0 +++ b/glib.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION glib-1.2.10-3 +# BEE_VERSION glib-1.2.10-4 # SRCURL[0]="https://ftp.gtk.org/pub/gtk/v${PKGVERSION[2]}/glib-${PKGVERSION}.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/6fe30dad87c77b91b632def29dd69ef9/glib-1.2.10.tar.gz" @@ -10,14 +10,18 @@ SRCURL[0]="https://beehive.molgen.mpg.de/6fe30dad87c77b91b632def29dd69ef9/glib-1 PATCHURL+=("https://beehive.molgen.mpg.de/81bd6526dcb780444b41d916a0d2197b/glib-1.2.10-isowarning.patch.gz") PATCHURL+=("https://beehive.molgen.mpg.de/7d1debeec4fe98902cd145d7401694cc/glib-1.2.10-gcc34.patch.gz") PATCHURL+=("https://beehive.molgen.mpg.de/920ae88a61bac9e5bcf0f8df6e504924/glib-1.2.10-underquoted.patch.gz") -PATCHURL+=("https://beehive.molgen.mpg.de/27efdfc73a7d8790965fdeb13e9ec583/glib-1.2.10-no_undefined.patch.gz") +#PATCHURL+=("https://beehive.molgen.mpg.de/27efdfc73a7d8790965fdeb13e9ec583/glib-1.2.10-no_undefined.patch.gz") PATCHURL+=("https://beehive.molgen.mpg.de/0d1d3ccfadfc653899948237989ffb60/glib-1.2.10-multilib.patch.gz") -PATCHURL+=("https://beehive.molgen.mpg.de/cf7a430ef31dcb901457bfab051f7d2e/glib-1.2.10-unused-dep.patch.gz") +#PATCHURL+=("https://beehive.molgen.mpg.de/cf7a430ef31dcb901457bfab051f7d2e/glib-1.2.10-unused-dep.patch.gz") PATCHURL+=("https://beehive.molgen.mpg.de/78d4e99209c40e7654ae1808a3c29773/glib-1.2.10-autotools.patch.gz") PATCHURL+=("https://beehive.molgen.mpg.de/07867923b21680ea1a0c8fd85cc8f6b8/glib-1.2.10-format.patch.gz") PATCHURL+=("https://beehive.molgen.mpg.de/a4eae0c33d4c0cc861d756c3288039a5/glib-1.2.10-gcc5.patch.gz") PATCHURL+=("https://beehive.molgen.mpg.de/077b4dadf1e272ad0e9b7b6736941941/glib-1.2.10-gcc9.patch.gz") +# https://aur.archlinux.org/packages/glib/ +# https://aur.archlinux.org/cgit/aur.git/plain/glib1-autotools.patch?h=glib +PATCHURL+=("https://beehive.molgen.mpg.de/1630c96b603136732064dc4f3ea677bf/glib1-autotools.patch") + # build_in_sourcedir # sourcesubdir_append src @@ -26,16 +30,20 @@ PATCHURL+=("https://beehive.molgen.mpg.de/077b4dadf1e272ad0e9b7b6736941941/glib- # bee_extract "${@}" #} -mee_patch() { - bee_patch "${@}" - cp -p /usr/share/automake-1.15/config.{guess,sub} . -} +#mee_patch() { +# bee_patch "${@}" +#} export CFLAGS='-O2 -fPIC' -#mee_configure() { -# bee_configure -#} +mee_configure_pre() { + cd ${S} + autoreconf --force --install +} + +mee_configure() { + bee_configure --host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu +} mee_build() { bee_build LIBTOOL=/usr/bin/libtool