Fix by Kito for building with gcc4 #104740 and move a bunch of ugly filefunc details...
authorMike Frysinger <vapier@gentoo.org>
Sat, 3 Sep 2005 20:31:42 +0000 (20:31 +0000)
committerMike Frysinger <vapier@gentoo.org>
Sat, 3 Sep 2005 20:31:42 +0000 (20:31 +0000)
Package-Manager: portage-2.0.51.22-r2

sys-apps/gawk/ChangeLog
sys-apps/gawk/Manifest
sys-apps/gawk/files/filefuncs/Makefile
sys-apps/gawk/files/gawk-3.1.5-gcc4.patch [new file with mode: 0644]
sys-apps/gawk/gawk-3.1.5.ebuild

index fd693a0a93ac028864e1d2e96f56c36af42cda32..dfb42162191ab08c0753bbb04882a0d0d13852ca 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.60 2005/09/02 19:31:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.61 2005/09/03 20:31:42 vapier Exp $
+
+  03 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gawk-3.1.5-gcc4.patch, files/filefuncs/Makefile, gawk-3.1.5.ebuild:
+  Fix by Kito for building with gcc4 #104740 and move a bunch of ugly filefunc
+  details out of the ebuild and into the filefunc Makefile.
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gawk-3.1.4-r4.ebuild:
   Stable on ppc.
index d061cb1d3c9b5b4eab01466f5429b3f5939a2a52..39c5eba7958caa959a2f7270cdb319fc12b61dfc 100644 (file)
@@ -1,18 +1,29 @@
-MD5 d6ee09b2386920be3e6297addeb71234 gawk-3.1.4-r4.ebuild 3859
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e82ad5eef80f8970d2b86a4ecdb9c688 ChangeLog 9732
-MD5 96320c1d57c8782d8b459bf68f17769a gawk-3.1.5.ebuild 3128
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 e0f9b7570483cbca8caa3706b334416c gawk-3.1.3-r2.ebuild 2764
-MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
-MD5 3cca4692ffa1c396bff698d02f1a41e0 files/gawk-3.1.4-disable-DFA.patch 1837
-MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3-r2 63
-MD5 8a25d43ff539b0c949fc5bbce8488e06 files/gawk-3.1.3-getpgrp_void.patch 1225
-MD5 c40ec6dfabda5864b7f62fa57d2329bd files/64bitnumfile.patch 340
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 1eda1e23e6e26fc2a1e30a15fa9b8028 gawk-3.1.5.ebuild 3053
+MD5 d6ee09b2386920be3e6297addeb71234 gawk-3.1.4-r4.ebuild 3859
+MD5 3ce0715c65e8d42e1a584f05d3eb249f ChangeLog 9999
 MD5 334e1cf92033c20c5e401f5ae5f498cc files/gawk-3.1.4-nextc.patch 716
+MD5 c40ec6dfabda5864b7f62fa57d2329bd files/64bitnumfile.patch 340
+MD5 6778659e2892fddf115cee2c244e60a8 files/gawk-3.1.4-flonum.patch 3341
 MD5 214193d03d4c328a4ba33aadc008d301 files/digest-gawk-3.1.5 63
+MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
 MD5 89145324fea9791b0caa1b09f5cee0cb files/gawk-3.1.5-core.patch 643
-MD5 6778659e2892fddf115cee2c244e60a8 files/gawk-3.1.4-flonum.patch 3341
-MD5 513af85f3e12197f97b42c3fee7c491c files/gawk-3.1.4-uplow.patch 5636
 MD5 e01879d30ddf2eb060f2ba2fa745a922 files/digest-gawk-3.1.4-r4 132
-MD5 f3561ccd6d2c2893dc5685743786dcb7 files/filefuncs/Makefile 973
+MD5 499e2881f167a17f2123ca338836e91d files/gawk-3.1.5-gcc4.patch 826
+MD5 3cca4692ffa1c396bff698d02f1a41e0 files/gawk-3.1.4-disable-DFA.patch 1837
+MD5 513af85f3e12197f97b42c3fee7c491c files/gawk-3.1.4-uplow.patch 5636
+MD5 8a25d43ff539b0c949fc5bbce8488e06 files/gawk-3.1.3-getpgrp_void.patch 1225
+MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3-r2 63
+MD5 7b48ab999f661a00e70da4eb9ede8376 files/filefuncs/Makefile 1192
 MD5 3159f74841ac19ed6237645e562f60c0 files/filefuncs/filefuncs.c 10992
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGghigIKl8Uu19MoRAjvSAJ44YArdb3NSWQFRIX2gYUEb3v4rXgCfTpB6
+rel8FOvg82x8KuAg+4lF5ZU=
+=vGLg
+-----END PGP SIGNATURE-----
index c3d99de9328e64edb4612de38b1e27683aeb6fdb..bd2cfca7ee94adf35d27861a9141c5c66e9bac08 100644 (file)
@@ -1,7 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.6 2005/05/14 17:56:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.7 2005/09/03 20:31:42 vapier Exp $
 
 CC ?= gcc
 LD = $(CC)
@@ -17,6 +17,21 @@ TARGET_LIB = $(TARGET).so.$(MAJORVER).$(MINORVER)
 
 LIBDIR = lib
 
+# Gentoo specific cruft, you like it dont ya idiot
+ifdef D
+DESTDIR = $(D)
+endif
+ifdef S
+AWKINCDIR = $(S)
+endif
+
+DOIT = yes
+ifeq ($(USERLAND),Darwin)
+DOIT = no
+endif
+
+ifeq ($(DOIT),yes)
+
 all: $(TARGET_LIB)
 
 $(TARGET).o: $(TARGET).c
@@ -34,3 +49,9 @@ install: $(TARGET_LIB)
 clean:
        rm -f $(TARGET)
        rm -f *.o *~ core
+
+else
+
+all install clean:
+
+endif
diff --git a/sys-apps/gawk/files/gawk-3.1.5-gcc4.patch b/sys-apps/gawk/files/gawk-3.1.5-gcc4.patch
new file mode 100644 (file)
index 0000000..3ebadcb
--- /dev/null
@@ -0,0 +1,23 @@
+Sat Sep  3 16:03:25 EDT 2005  Kito Danya Dietrich  <kito@gentoo.org>
+
+       * hard-locale.h (hard_locale): Declare xmalloc in global scope rather than
+       function scope which gcc-4.x rejects.
+
+--- gawk-3.1.5/hard-locale.h
++++ gawk-3.1.5/hard-locale.h
+@@ -21,6 +21,7 @@
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+ 
++static ptr_t xmalloc PARAMS ((size_t n));
+ 
+ /* Return nonzero if the current CATEGORY locale is hard, i.e. if you
+    can't get away with assuming traditional C or POSIX behavior.  */
+@@ -40,7 +41,6 @@
+       if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+       hard = 0;
+ # else
+-      static ptr_t xmalloc PARAMS ((size_t n));
+ 
+       char *locale = xmalloc (strlen (p) + 1);
+       strcpy (locale, p);
index fda7e6d69bb1d810b501d3ad7527211092fb6580..19af880728394054592dabd8f43ad45186780e8c 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.5.ebuild,v 1.3 2005/09/02 05:11:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.5.ebuild,v 1.4 2005/09/03 20:31:42 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,6 +27,7 @@ src_unpack() {
 
        cd "${S}"
        epatch "${FILESDIR}"/${P}-core.patch
+       epatch "${FILESDIR}"/${P}-gcc4.patch
        epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch #fedora
        # support for dec compiler.
        [[ $(tc-getCC) == "ccc" ]] && epatch "${FILESDIR}"/${PN}-3.1.2-dec-alpha-compiler.diff
@@ -41,20 +42,13 @@ src_compile() {
        emake || die "emake failed"
 
        cd "${SFFS}"
-       emake AWKINCDIR="${S}" CC=$(tc-getCC) || die "filefuncs emake failed"
+       emake CC=$(tc-getCC) || die "filefuncs emake failed"
 }
 
 src_install() {
        make install DESTDIR="${D}" || die "install failed"
-       if ! use userland_Darwin ; then
-               cd "${SFFS}"
-               make \
-                       DESTDIR="${D}" \
-                       AWKINCDIR="${S}" \
-                       LIBDIR="$(get_libdir)" \
-                       install \
-                       || die "filefuncs install failed"
-       fi
+       cd "${SFFS}"
+       make LIBDIR="$(get_libdir)" install || die "filefuncs install failed"
 
        dodir /usr/bin
        # In some rare cases, (p)gawk gets installed as (p)gawk- and not