[Glibc-bsd-commits] r4284 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-05-25 17:16:45 +0000 (Fri, 25 May 2012)
New Revision: 4284

Removed:
   trunk/freebsd-buildutils/debian/install
   trunk/freebsd-buildutils/debian/links
   trunk/freebsd-buildutils/debian/local/
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
   trunk/freebsd-buildutils/debian/rules
Log:
Remove compatibility hacks (now provided by freebsd-glue).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-05-25 17:14:29 UTC (rev 4283)
+++ trunk/freebsd-buildutils/debian/changelog	2012-05-25 17:16:45 UTC (rev 4284)
@@ -6,6 +6,7 @@
   * Add MK_CTF build option.
   * nostrip.diff: By default, install without -s.  Let dh_strip, etc
     handle stripping (and honor DEB_BUILD_OPTIONS=nostrip, etc).
+  * Remove compatibility hacks (now provided by freebsd-glue).
 
  -- Robert Millan <rmh at debian.org>  Sat, 28 Apr 2012 00:16:19 +0200
 

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2012-05-25 17:14:29 UTC (rev 4283)
+++ trunk/freebsd-buildutils/debian/control	2012-05-25 17:16:45 UTC (rev 4284)
@@ -6,6 +6,7 @@
 Build-Depends: debhelper (>= 7), flex, bison,
  libbsd-dev (>= 0.3.0),
  pkg-config,
+ freebsd-glue,
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-buildutils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-buildutils/
 Standards-Version: 3.9.2
@@ -13,11 +14,7 @@
 Package: freebsd-buildutils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, bsdmainutils, unzip, patchutils,
-# Dependencies needed because of symlinks in /usr/lib/freebsd:
-#   awk -> original-awk
- original-awk,
-#   gmake -> make
- make
+ freebsd-glue,
 Conflicts: freebsd5-buildutils, freebsd6-buildutils, pmake
 Provides: freebsd6-buildutils, freebsd7-buildutils
 Description: Utilities for building FreeBSD sources

Deleted: trunk/freebsd-buildutils/debian/install
===================================================================
--- trunk/freebsd-buildutils/debian/install	2012-05-25 17:14:29 UTC (rev 4283)
+++ trunk/freebsd-buildutils/debian/install	2012-05-25 17:16:45 UTC (rev 4284)
@@ -1 +0,0 @@
-debian/local/include/*		usr/include/freebsd

Deleted: trunk/freebsd-buildutils/debian/links
===================================================================
--- trunk/freebsd-buildutils/debian/links	2012-05-25 17:14:29 UTC (rev 4283)
+++ trunk/freebsd-buildutils/debian/links	2012-05-25 17:16:45 UTC (rev 4284)
@@ -1,3 +0,0 @@
-bin/dash		usr/lib/freebsd/sh
-usr/bin/original-awk	usr/lib/freebsd/awk
-usr/bin/make		usr/lib/freebsd/gmake

Modified: trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff	2012-05-25 17:14:29 UTC (rev 4283)
+++ trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff	2012-05-25 17:16:45 UTC (rev 4284)
@@ -12,7 +12,7 @@
  	@echo 'make started.'
 -	cc -D__dead2="" -D__unused="" -Darc4random=random -D__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c
 -	cc *.o -o pmake
-+	cc -D_GNU_SOURCE=1 -isystem ../../../../debian/local/include -DDEFSHELLNAME=\"sh\" -I. -c *.c -g
++	cc -D_GNU_SOURCE=1 -isystem /usr/include/freebsd -DDEFSHELLNAME=\"sh\" -I. -c *.c -g
 +	cc *.o -lbsd -o pmake
  	@echo 'make completed.'
  

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2012-05-25 17:14:29 UTC (rev 4283)
+++ trunk/freebsd-buildutils/debian/rules	2012-05-25 17:16:45 UTC (rev 4284)
@@ -52,7 +52,7 @@
          -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
          -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
          -I$(CURDIR)/build-tree/src/sys \
-	-D_GNU_SOURCE=1 -isystem $(CURDIR)/debian/local/include
+	-D_GNU_SOURCE=1 -isystem /usr/include/freebsd
 # disabled due to #630907 (see also 20_libbsd_overlay.diff)
 # $(shell pkg-config --cflags libbsd-overlay)
 MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO