[Glibc-bsd-commits] r6125 - in trunk/freebsd-buildutils/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Tue Nov 29 15:28:20 UTC 2016
Author: stevenc-guest
Date: 2016-11-29 15:28:20 +0000 (Tue, 29 Nov 2016)
New Revision: 6125
Added:
trunk/freebsd-buildutils/debian/patches/armhf.diff
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/patches/series
trunk/freebsd-buildutils/debian/rules
Log:
Create a new MACHINE_ARCH armv6hf for linux armhf and kfreebsd-armhf
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2016-10-20 00:30:50 UTC (rev 6124)
+++ trunk/freebsd-buildutils/debian/changelog 2016-11-29 15:28:20 UTC (rev 6125)
@@ -4,6 +4,7 @@
to set CFLAGS, respecting DEB_BUILD_OPTIONS flags such as noopt
* Enable hardening=+all, which includes PIE, relro and stack protector
* Use architecture.mk instead of individual calls to dpkg-architecture
+ * Create a new MACHINE_ARCH armv6hf for linux armhf and kfreebsd-armhf
-- Steven Chamberlain <stevenc at debian.org> Tue, 19 Jul 2016 10:13:07 +0100
Added: trunk/freebsd-buildutils/debian/patches/armhf.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/armhf.diff (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/armhf.diff 2016-11-29 15:28:20 UTC (rev 6125)
@@ -0,0 +1,13 @@
+--- a/src/share/mk/bsd.cpu.mk
++++ b/src/share/mk/bsd.cpu.mk
+@@ -261,6 +261,10 @@
+ _CPUCFLAGS += -mfloat-abi=softfp
+ .endif
+
++.if ${MACHINE_ARCH} == "armv6hf"
++_CPUCFLAGS += -mfloat-abi=hard -mfpu=vfp
++.endif
++
+ # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
+
+ .if !defined(NO_CPU_CFLAGS)
Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series 2016-10-20 00:30:50 UTC (rev 6124)
+++ trunk/freebsd-buildutils/debian/patches/series 2016-11-29 15:28:20 UTC (rev 6125)
@@ -31,3 +31,4 @@
hppa.diff
man_symlinks.diff
ar_command_lines.diff
+armhf.diff
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2016-10-20 00:30:50 UTC (rev 6124)
+++ trunk/freebsd-buildutils/debian/rules 2016-11-29 15:28:20 UTC (rev 6125)
@@ -31,13 +31,37 @@
MACHINE_MULTIARCH := $(DEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_CPU), arm)
+ifneq (,$(findstring armhf,$(DEB_HOST_ARCH))
+MACHINE_ARCH := armv6hf
+else
MACHINE_ARCH := armv6
endif
+endif
ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
export STRIPFLAG=
endif
+EXTRA_CFLAGS = \
+ -D_GNU_SOURCE -pipe -Wall \
+ -DMACHINE_ARCH='\"$(MACHINE_ARCH)\"' \
+ -DMACHINE_MULTIARCH='\"$(MACHINE_MULTIARCH)\"' \
+ -I$(CURDIR)/build-tree/src/sys \
+ -isystem /usr/include/freebsd \
+ -fPIC \
+ $(CPPFLAGS) \
+ $(NULL)
+# disabled due to #630907 (see also 20_libbsd_overlay.diff)
+# $(shell pkg-config --cflags libbsd-overlay)
+CFLAGS += $(EXTRA_CFLAGS)
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+
+ # Do not mess with MAKEFLAGS until we transfer control to BSD make (see below)
+ BSD_MAKEFLAGS += -j$(NUMJOBS)
+endif
+
SVN_BASE := https://svn.freebsd.org/base
#SVN := $(SVN_BASE)/release/$(version).0
SVN := $(SVN_BASE)/releng/$(version)
@@ -49,31 +73,18 @@
TARNAME = $(SOURCE)_$(tar_version).orig.tar.xz
SOURCE_DATE_EPOCH ?= $(shell date -d "$$(dpkg-parsechangelog -SDate)" +%s)
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-
- # Do not mess with MAKEFLAGS until we transfer control to BSD make (see below)
- BSD_MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-export CFLAGS += -O2 -g -Wall -D_GNU_SOURCE \
- -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
- -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
- -I$(CURDIR)/build-tree/src/sys \
- -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 = \
+PMAKE_COMMON = \
+ MAKEFLAGS=$(BSD_MAKEFLAGS) \
+ NO_WERROR=1 NOGCCERROR=1 \
+ NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 \
+ bmake \
CC=$(CC) \
- NO_WERROR=1 \
- NOGCCERROR=1 \
- NOSHARED=NO \
- NO_SHARED=NO
+ -m $(CURDIR)/src/share/mk \
+ $(NULL)
+PMAKE = \
+ CFLAGS="$(CFLAGS)" \
+ $(PMAKE_COMMON)
-PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
-PMAKE = \
- MAKEFLAGS=$(BSD_MAKEFLAGS) \
- bmake $(PMAKE_FLAGS)
YACC = byacc
package = $(SOURCE)
@@ -126,26 +137,26 @@
build-stamp: unpack-stamp
dh_testdir
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/make
+ $(PMAKE) -C build-tree/src/usr.bin/make
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/cksum
+ $(PMAKE) -C build-tree/src/usr.bin/cksum
cd build-tree/src/usr.bin/lex ; \
$(PMAKE) bootstrap ; \
- $(PMAKE) $(MAKE_BUILD_FLAGS) NO_PROFILE=1 NO_INSTALLLIB=1
+ $(PMAKE) NO_INSTALLLIB=1
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/mkdep
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/mtree
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/file2c
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/brandelf
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/sys/dev/aic7xxx/aicasm
+ $(PMAKE) -C build-tree/src/usr.bin/mkdep
+ $(PMAKE) -C build-tree/src/usr.sbin/mtree
+ $(PMAKE) -C build-tree/src/usr.bin/file2c
+ $(PMAKE) -C build-tree/src/usr.bin/brandelf
+ $(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm
ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
# Not portable yet. Maybe someday...
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/kldxref
+ $(PMAKE) -C build-tree/src/usr.sbin/kldxref
endif
PATH=$(CURDIR)/build-tree/src/usr.bin/file2c:$(PATH) \
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/config
+ $(PMAKE) -C build-tree/src/usr.sbin/config
touch build-stamp
More information about the Glibc-bsd-commits
mailing list