r1178 - in trunk/freebsd6-buildutils/debian: . patches
Author: rmh
Date: 2006-02-13 08:27:48 +0000 (Mon, 13 Feb 2006)
New Revision: 1178
Removed:
trunk/freebsd6-buildutils/debian/patches/06_ftbfs_gcc-4.0.diff
Modified:
trunk/freebsd6-buildutils/debian/changelog
trunk/freebsd6-buildutils/debian/control
trunk/freebsd6-buildutils/debian/rules
Log:
* Fixes runtime getopt parsing infin loop.
- rules (COPTS): Build with -D_GNU_SOURCE.
- rules: Rename internal getline function to avoid collision with the one
from Glibc (s/getline/bsd_&/g).
- patches/06_ftbfs_gcc-4.0.diff: Remove (it had dirty getopt hacks as well).
Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog 2006-02-12 16:50:53 UTC (rev 1177)
+++ trunk/freebsd6-buildutils/debian/changelog 2006-02-13 08:27:48 UTC (rev 1178)
@@ -29,8 +29,17 @@
- rules: Install mk and Mk in /usr/share.
* patches/000_fix_make_double_free.diff: New. Patch from upstream
(1.155:1.158). Thanks to Petr for spotting this.
+ * Build using gcc 3.4, like upstream.
+ - control (Build-Depends): Add gcc-3.4.
+ - rules: Pass CC=gcc-3.4 to make.
+ - patches/06_ftbfs_gcc-4.0.diff: Remove.
+ * Fixes runtime getopt parsing infin loop.
+ - rules (COPTS): Build with -D_GNU_SOURCE.
+ - rules: Rename internal getline function to avoid collision with the one
+ from Glibc (s/getline/bsd_&/g).
+ - patches/06_ftbfs_gcc-4.0.diff: Remove (it had dirty getopt hacks as well).
- -- Robert Millan <rmh@aybabtu.com> Sun, 12 Feb 2006 17:48:57 +0100
+ -- Robert Millan <rmh@aybabtu.com> Mon, 13 Feb 2006 09:24:59 +0100
freebsd5-buildutils (5.4-3) unstable; urgency=low
Modified: trunk/freebsd6-buildutils/debian/control
===================================================================
--- trunk/freebsd6-buildutils/debian/control 2006-02-12 16:50:53 UTC (rev 1177)
+++ trunk/freebsd6-buildutils/debian/control 2006-02-13 08:27:48 UTC (rev 1178)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd@lists.debian.org>
Uploaders: Aurelien Jarno <aurel32@debian.org>, Guillem Jover <guillem@debian.org>
-Build-Depends: patchutils (>= 0.2.25), debhelper (>= 4.1.0), pmake, flex, bison, libbsd-dev
+Build-Depends: patchutils (>= 0.2.25), debhelper (>= 4.1.0), pmake, flex, bison, libbsd-dev, gcc-3.4
Standards-Version: 3.6.2
Package: freebsd6-buildutils
Deleted: trunk/freebsd6-buildutils/debian/patches/06_ftbfs_gcc-4.0.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/06_ftbfs_gcc-4.0.diff 2006-02-12 16:50:53 UTC (rev 1177)
+++ trunk/freebsd6-buildutils/debian/patches/06_ftbfs_gcc-4.0.diff 2006-02-13 08:27:48 UTC (rev 1178)
@@ -1,29 +0,0 @@
-diff -ur src/usr.bin/make/job.c src/usr.bin/make/job.c
---- src/usr.bin/make/job.c 2005-12-17 12:46:35.000000000 +0100
-+++ src/usr.bin/make/job.c 2005-12-17 12:59:30.000000000 +0100
-@@ -304,7 +304,7 @@
- * The maximum number of jobs that may run. This is initialize from the
- * -j argument for the leading make and from the FIFO for sub-makes.
- */
--static int maxJobs;
-+int maxJobs;
-
- static int nJobs; /* The number of children currently running */
-
-diff -ur src/usr.bin/make/main.c src/usr.bin/make/main.c
---- src/usr.bin/make/main.c 2005-12-17 12:46:35.000000000 +0100
-+++ src/usr.bin/make/main.c 2005-12-17 12:59:30.000000000 +0100
-@@ -329,12 +329,11 @@
- static void
- MainParseArgs(int argc, char **argv)
- {
-- int c;
-+ int c, optind;
- Boolean found_dd = FALSE;
-
- rearg:
- optind = 1; /* since we're called more than once */
-- optreset = 1;
- #define OPTFLAGS "ABC:D:E:I:PSV:Xd:ef:ij:km:nqrstvx:"
- for (;;) {
- if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
Modified: trunk/freebsd6-buildutils/debian/rules
===================================================================
--- trunk/freebsd6-buildutils/debian/rules 2006-02-12 16:50:53 UTC (rev 1177)
+++ trunk/freebsd6-buildutils/debian/rules 2006-02-13 08:27:48 UTC (rev 1178)
@@ -12,8 +12,8 @@
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
PMAKE=pmake
-CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='\"$(DEB_HOST_ARCH_CPU)\"'
-MAKE_BUILD_FLAGS= COPTS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='\"$(DEB_HOST_ARCH_CPU)\"' -D_GNU_SOURCE
+MAKE_BUILD_FLAGS= CC=gcc-3.4 COPTS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
YACC=$(CURDIR)/build-tree/src/usr.bin/yacc/yacc
export LDADD=-lbsd
@@ -25,8 +25,9 @@
tar -C build-tree -xzf src.tar.gz
find build-tree -type d -name CVS | xargs rm -rf
find build-tree -type f | (while read i ; do sed -i $$i \
- -e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" ; \
- done)
+ -e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" \
+ -e "s/getline/bsd_&/g" \
+ ; done)
set -e ; cd build-tree && \
for i in $(CURDIR)/debian/patches/*.diff ; do \
echo "--- Patch $$i ---" ; \
Reply to: