r1180 - in trunk/freebsd6-buildutils/debian: . patches
Author: rmh
Date: 2006-02-13 09:03:08 +0000 (Mon, 13 Feb 2006)
New Revision: 1180
Added:
trunk/freebsd6-buildutils/debian/patches/11_optreset.diff
Modified:
trunk/freebsd6-buildutils/debian/changelog
Log:
patches/11_optreset.diff: New. Replace unportable optreset mangling with reset_getopt () from libbsd.
Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog 2006-02-13 09:02:17 UTC (rev 1179)
+++ trunk/freebsd6-buildutils/debian/changelog 2006-02-13 09:03:08 UTC (rev 1180)
@@ -38,8 +38,10 @@
- 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).
+ * patches/11_optreset.diff: New. Replace unportable optreset mangling
+ with reset_getopt () from libbsd.
- -- Robert Millan <rmh@aybabtu.com> Mon, 13 Feb 2006 09:24:59 +0100
+ -- Robert Millan <rmh@aybabtu.com> Mon, 13 Feb 2006 11:03:00 +0100
freebsd5-buildutils (5.4-3) unstable; urgency=low
Added: trunk/freebsd6-buildutils/debian/patches/11_optreset.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/11_optreset.diff 2006-02-13 09:02:17 UTC (rev 1179)
+++ trunk/freebsd6-buildutils/debian/patches/11_optreset.diff 2006-02-13 09:03:08 UTC (rev 1180)
@@ -0,0 +1,12 @@
+--- src/usr.bin/make/main.c~ 2006-02-13 10:59:47.000000000 +0100
++++ src/usr.bin/make/main.c 2006-02-13 11:00:11.000000000 +0100
+@@ -337,8 +337,7 @@
+ Boolean found_dd = FALSE;
+
+ rearg:
+- optind = 1; /* since we're called more than once */
+- optreset = 1;
++ reset_getopt ();
+ #define OPTFLAGS "ABC:D:E:I:PSV:Xd:ef:ij:km:nqrstvx:"
+ for (;;) {
+ if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
Reply to: