Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce0cde1b1ba06b47d90a2a2dddf1aa3952f89f3a

commit ce0cde1b1ba06b47d90a2a2dddf1aa3952f89f3a
Author: crazy <[EMAIL PROTECTED]>
Date:   Thu Jul 17 18:12:43 2008 +0200

pacman-g2-3.7.0-3-i686
* release bump
* some typo fixes for 32bit
* added patches to fix compile errors with glibc2.8

diff --git a/source/base/pacman-g2/FrugalBuild 
b/source/base/pacman-g2/FrugalBuild
index daf572f..33a34d9 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=pacman-g2
pkgver=3.7.0
Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac
-pkgrel=2
+pkgrel=3
pkgdesc="A .tar.bz2 based package manager library (libpacman) and client 
(pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/";
backup=(etc/{makepkg,pacman-g2}.conf 
etc/pacman-g2/repos/{frugalware,frugalware-current})
@@ -20,8 +20,9 @@ archs=('i686' 'x86_64' 'ppc')
_F_archive_nosort=y
up2date="lynx -dump $url/releases/ |Flasttar"
if ! Fuse $USE_DEVEL; then
-       source=($url/releases/$pkgname-$pkgver.tar.gz generic-switch.patch)
-       signatures=("$source.asc" '')
+       source=($url/releases/$pkgname-$pkgver.tar.gz \
+               generic-switch.patch glibc28-rename-index.patch 
glibc28-libftp-need-GNU_SOURCE.patch)
+       signatures=("$source.asc" '' '' '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
@@ -39,14 +40,6 @@ build()
fi

CFLAGS=${CFLAGS/O2/O0}
-       ## avoid building it twice while generic switch
-       if [ "$CARCH" == "i686" ]; then
-               CFLAGS=${CFLAGS/-march=i686/-march=i686 -mtune=generic}
-               CXXFLAGS=${CXXFLAGS/-march=i686/-march=i686 -mtune=generic}
-       else
-               CFLAGS=${CFLAGS/-march=k8/-march=x86-64 -mtune=generic}
-               CXXFLAGS=${CXXFLAGS/-march=k8/-march=x86-64 -mtune=generic}
-       fi
unset MAKEFLAGS
Fcd
Fpatchall
diff --git a/source/base/pacman-g2/generic-switch.patch 
b/source/base/pacman-g2/generic-switch.patch
index 52a79bb..5972f40 100644
--- a/source/base/pacman-g2/generic-switch.patch
+++ b/source/base/pacman-g2/generic-switch.patch
@@ -31,8 +31,8 @@ index c2cbc5d..b7dad35 100644
-#export CXXFLAGS="-mcpu=i686 -O2 -pipe"
+# As of GCC 4.2 -mtune=generic can be used to generate code running well on
+# common x86 chips.
-+export CFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ --mtune=generic -O2 -pipe"
-+export CXXFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ --mtune=generic -O2 
-pipe"
++export CFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ -mtune=generic -O2 -pipe"
++export CXXFLAGS="[EMAIL PROTECTED]@[EMAIL PROTECTED]@ -mtune=generic -O2 
-pipe"

# SMP Systems
#export MAKEFLAGS="-j2"
@@ -59,7 +59,7 @@ index 6fefcae..7623725 100755
+if [ -e /etc/frugalware-release ]; then
+       if [[ "${_glibcver} == ${_glibcver_generic}" ]] || [[ "${_glibcver}" > 
"${_glibcver_generic}" ]]; then
+               if [ "$CARCH" == "i686" ]; then
-+                      if ! $ECHO ${CFLAGS}|grep -q "mtune=genric"; then
++                      if ! $ECHO ${CFLAGS}|grep -q "mtune=generic"; then
+                               export CFLAGS="$CFLAGS -mtune=generic"
+                       fi
+                       if ! $ECHO ${CXXFLAGS}|grep -q "mtune=generic"; then
diff --git a/source/base/pacman-g2/glibc28-libftp-need-GNU_SOURCE.patch 
b/source/base/pacman-g2/glibc28-libftp-need-GNU_SOURCE.patch
new file mode 100644
index 0000000..84152b8
--- /dev/null
+++ b/source/base/pacman-g2/glibc28-libftp-need-GNU_SOURCE.patch
@@ -0,0 +1,10 @@
+diff -Naur pacman-g2-3.7.0/lib/libftp/Makefile.am 
pacman-g2-3.7.0-glibc28/lib/libftp/Makefile.am
+--- pacman-g2-3.7.0/lib/libftp/Makefile.am     2008-06-01 01:26:49.000000000 
+0200
++++ pacman-g2-3.7.0-glibc28/lib/libftp/Makefile.am     2008-07-17 
18:05:16.000000000 +0200
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = gnu
+-DEFINES = -DFTPLIB_DEFMODE=FTPLIB_PORT -D_REENTRANT
++DEFINES = -DFTPLIB_DEFMODE=FTPLIB_PORT -D_REENTRANT -D_GNU_SOURCE
+ AM_CFLAGS = $(DEFINES)
+
+ #SOMAJOR = 3
diff --git a/source/base/pacman-g2/glibc28-rename-index.patch 
b/source/base/pacman-g2/glibc28-rename-index.patch
new file mode 100644
index 0000000..8546055
--- /dev/null
+++ b/source/base/pacman-g2/glibc28-rename-index.patch
@@ -0,0 +1,54 @@
+diff -Naur pacman-g2-3.7.0/src/versort/versort.c 
pacman-g2-3.7.0-p/src/versort/versort.c
+--- pacman-g2-3.7.0/src/versort/versort.c      2008-06-01 01:26:49.000000000 
+0200
++++ pacman-g2-3.7.0-p/src/versort/versort.c    2008-07-17 14:00:02.000000000 
+0200
+@@ -47,7 +47,7 @@
+ static size_t buffer_nmemb = 0;
+ static size_t buffer_size = 0;
+
+-static char **index = NULL;
++static char **ver_index = NULL;
+ static size_t index_nmemb = 0;
+ static size_t index_size = 0;
+
+@@ -102,15 +102,15 @@
+               {
+                       if (tmp_index == index_size) {
+                               index_size += BUFFER_CHUNK;
+-                              index = realloc(index, index_size * sizeof(char 
*));
+-                              if (!index)
++                              ver_index = realloc(ver_index, index_size * 
sizeof(char *));
++                              if (!ver_index)
+                                       exit(EXIT_FAILURE);
+                       }
+
+                       switch (status)
+                       {
+                       case STATUS_MARK: // Mark a new buffer
+-                              index[index_nmemb] = &buffer[tmp_index];
++                              ver_index[index_nmemb] = &buffer[tmp_index];
+                               ++index_nmemb;
+                               status = STATUS_SEARCH;
+                               break;
+@@ -136,7 +136,7 @@
+       size_t i;
+
+       for (i = 0; i < index_nmemb; i++)
+-              puts(index[i]);
++              puts(ver_index[i]);
+ }
+
+ static int vercmpp(const void *p1, const void *p2)
+@@ -167,11 +167,11 @@
+
+       makeindex();
+
+-      qsort(index, index_nmemb, sizeof(char *), vercmpp);
++      qsort(ver_index, index_nmemb, sizeof(char *), vercmpp);
+
+       printindex();
+
+-      free(index);
++      free(ver_index);
+       free(buffer);
+
+       exit(EXIT_SUCCESS);
diff --git a/source/base/pacman-g2/pacman-g2.install 
b/source/base/pacman-g2/pacman-g2.install
index 78c70cf..0c26ecb 100644
--- a/source/base/pacman-g2/pacman-g2.install
+++ b/source/base/pacman-g2/pacman-g2.install
@@ -17,11 +17,11 @@ post_upgrade()
fi
if [ "$PARCH" = "i686" ]; then
if ! grep -q "mtune=genric" /etc/makepkg.conf; then
-                       sed -e 's/-march=i686/-march=i686 -mtune=generic/' -i 
/etc/makepkg.conf*
+                       sed -e 's/-march=i686/-march=i686 -mtune=generic/' -i 
/etc/makepkg.conf
fi
else
if grep -q "march=k8" /etc/makepkg.conf; then
-                       sed -e 's/-march=k8/-march=x86-64 -mtune=generic/' -i 
/etc/makepkg.conf*
+                       sed -e 's/-march=k8/-march=x86-64 -mtune=generic/' -i 
/etc/makepkg.conf
fi
fi
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to