diff options
| author | orchidman <lesibel@free.fr> | 2012-01-27 19:59:49 +0100 |
|---|---|---|
| committer | orchidman <lesibel@free.fr> | 2012-01-27 19:59:49 +0100 |
| commit | 18458e62549e67d86d589a92b6734f8551a4a213 (patch) | |
| tree | a7352c08523dda5b73352ab3a54386083f462fcf | |
| parent | 952b7578b731e3d42aa6e11f232c6b6b47c3f096 (diff) | |
| parent | 520d10db4eb29d9140ed2d94722ba1b84a721b77 (diff) | |
| download | nutyx-extra-18458e62549e67d86d589a92b6734f8551a4a213.tar.gz nutyx-extra-18458e62549e67d86d589a92b6734f8551a4a213.tar.bz2 nutyx-extra-18458e62549e67d86d589a92b6734f8551a4a213.tar.xz nutyx-extra-18458e62549e67d86d589a92b6734f8551a4a213.zip | |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/extra
| -rw-r--r-- | glib1/.footprint.x86_64 | 9 | ||||
| -rwxr-xr-x | glib1/Pkgfile | 6 | ||||
| -rwxr-xr-x | gtk1/Pkgfile | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/glib1/.footprint.x86_64 b/glib1/.footprint.x86_64 index be34292a2..f7be0bdf3 100644 --- a/glib1/.footprint.x86_64 +++ b/glib1/.footprint.x86_64 @@ -9,12 +9,21 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/glib/ drwxr-xr-x root/root usr/lib/glib/include/ -rw-r--r-- root/root usr/lib/glib/include/glibconfig.h +lrwxrwxrwx root/root usr/lib/libglib-1.2.so.0 -> libglib-1.2.so.0.0.10 +-rwxr-xr-x root/root usr/lib/libglib-1.2.so.0.0.10 -rw-r--r-- root/root usr/lib/libglib.a -rwxr-xr-x root/root usr/lib/libglib.la +lrwxrwxrwx root/root usr/lib/libglib.so -> libglib-1.2.so.0.0.10 +lrwxrwxrwx root/root usr/lib/libgmodule-1.2.so.0 -> libgmodule-1.2.so.0.0.10 +-rwxr-xr-x root/root usr/lib/libgmodule-1.2.so.0.0.10 -rw-r--r-- root/root usr/lib/libgmodule.a -rw-r--r-- root/root usr/lib/libgmodule.la +lrwxrwxrwx root/root usr/lib/libgmodule.so -> libgmodule-1.2.so.0.0.10 +lrwxrwxrwx root/root usr/lib/libgthread-1.2.so.0 -> libgthread-1.2.so.0.0.10 +-rwxr-xr-x root/root usr/lib/libgthread-1.2.so.0.0.10 -rw-r--r-- root/root usr/lib/libgthread.a -rwxr-xr-x root/root usr/lib/libgthread.la +lrwxrwxrwx root/root usr/lib/libgthread.so -> libgthread-1.2.so.0.0.10 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/glib.pc -rw-r--r-- root/root usr/lib/pkgconfig/gmodule.pc diff --git a/glib1/Pkgfile b/glib1/Pkgfile index 7543ccda9..495c89318 100755 --- a/glib1/Pkgfile +++ b/glib1/Pkgfile @@ -5,7 +5,7 @@ name=glib1 version=1.2.10 -release=1 +release=2 localname=glib source=( http://gd.tuwien.ac.at/graphics/gimp/gtk/v1.2/$localname-$version.tar.gz\ http://nutyx.meticul.eu/files/patchs/$name/{config.patch,gcc340.patch} ) @@ -15,10 +15,10 @@ build() { cd $localname-$version patch -Np1 -i ../config.patch patch -Np1 -i ../gcc340.patch +[ "`uname -m`" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' ./configure --prefix=/usr --host=`uname -m`\ --mandir=/usr/share/man \ - --infodir=/usr/share/info -make + --infodir=/usr/share/info $CONFIGFLAG make DESTDIR=$PKG install if [ -f $PKG/usr/lib/libgmodule-1.2.so.0.0.10 ]; then chmod -v 755 $PKG/usr/lib/libgmodule-1.2.so.0.0.10 diff --git a/gtk1/Pkgfile b/gtk1/Pkgfile index 6ae55d8ea..ef76082a8 100755 --- a/gtk1/Pkgfile +++ b/gtk1/Pkgfile @@ -18,7 +18,6 @@ if [ "`uname -m`" == "x86_64" ]; then rm config.guess config.sub cp ../config.guess config.guess cp ../config.sub config.sub - export CFLAGS="${CFLAGS} -fPIC" fi patch -Np0 -i ../aclocal-fixes.patch ./configure --prefix=/usr \ |