[Glibc-bsd-commits] r4312 - in trunk/freebsd-buildutils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Jun 16 10:17:44 UTC 2012
Author: rmh
Date: 2012-06-16 10:17:44 +0000 (Sat, 16 Jun 2012)
New Revision: 4312
Added:
trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff
trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
Removed:
trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff
trunk/freebsd-buildutils/debian/patches/make_foreign.diff
trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff
trunk/freebsd-buildutils/debian/patches/mk_ctf.diff
trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/control
trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff
trunk/freebsd-buildutils/debian/patches/nostrip.diff
trunk/freebsd-buildutils/debian/patches/series
trunk/freebsd-buildutils/debian/rules
Log:
* New upstream snapshot.
- Removes yacc (it's been replaced by byacc in upstream).
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/changelog 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,3 +1,10 @@
+freebsd-buildutils (10~svn237137-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ - Removes yacc (it's been replaced by byacc in upstream).
+
+ -- Robert Millan <rmh at debian.org> Sat, 16 Jun 2012 12:17:10 +0200
+
freebsd-buildutils (9.0-10) unstable; urgency=low
* disable_wsystem_headers.diff: Disable -Wsystem-headers to avoid
Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/control 2012-06-16 10:17:44 UTC (rev 4312)
@@ -7,6 +7,7 @@
libbsd-dev (>= 0.3.0),
pkg-config,
freebsd-glue,
+ byacc (>= 20120115~),
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
@@ -19,7 +20,7 @@
Provides: freebsd6-buildutils, freebsd7-buildutils
Description: Utilities for building FreeBSD sources
This package contains the FreeBSD counterparts of some standard build
- utilities (make, yacc, lex ..)
+ utilities (make, mkdep, lex ..)
.
They have some specific modifications needed to be able to build FreeBSD
- sources (such as kfreebsd-8).
+ sources.
Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -65,7 +65,7 @@
.PHONY: ${INSTALLINFODIRS}
--- a/src/share/mk/bsd.lib.mk
+++ b/src/share/mk/bsd.lib.mk
-@@ -146,9 +146,9 @@
+@@ -135,9 +135,9 @@
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -77,7 +77,7 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -163,9 +163,9 @@
+@@ -152,9 +152,9 @@
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -89,27 +89,27 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -186,16 +186,16 @@
+@@ -180,16 +180,16 @@
@${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${.TARGET} ${SHLIB_LINK}
.if defined(SHLIB_LINK)
- @ln -fs ${.TARGET} ${SHLIB_LINK}
-+ @ln -fs ${SHLIBDIR}${.TARGET} ${SHLIB_LINK}
++ @ln -fs ${SHLIBDIR}/${.TARGET} ${SHLIB_LINK}
.endif
.if !defined(NM)
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
+ @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} \
- `lorder ${SOBJS} | tsort -q` ${LDADD}
+ `lorder ${SOBJS} | tsort` ${LDADD}
.else
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
+ @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} \
- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+ `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
.endif
.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -265,11 +265,11 @@
+@@ -259,11 +259,11 @@
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
Modified: trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,9 +1,3 @@
----
- src/usr.bin/cksum/Makefile | 2 +-
- src/usr.bin/lex/Makefile | 6 +++---
- src/usr.bin/yacc/Makefile | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
--- a/src/usr.bin/cksum/Makefile
+++ b/src/usr.bin/cksum/Makefile
@@ -3,7 +3,7 @@
@@ -30,14 +24,3 @@
SRCS= scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \
skel.c sym.c tblcmp.c yylex.c
---- a/src/usr.bin/yacc/Makefile
-+++ b/src/usr.bin/yacc/Makefile
-@@ -6,7 +6,7 @@
- skeleton.c symtab.c verbose.c warshall.c
- SCRIPTS=yyfix.sh
- MAN= yacc.1 yyfix.1
--LINKS= ${BINDIR}/yacc ${BINDIR}/byacc
-+SIMLINKS= ${BINDIR}/yacc ${BINDIR}/byacc
- MLINKS= yacc.1 byacc.1
-
- .include <bsd.prog.mk>
Deleted: trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/09_ports_path.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/09_ports_path.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,136 +0,0 @@
----
- ports/Mk/bsd.port.mk | 24 ++++++++++++------------
- src/share/mk/bsd.port.mk | 2 +-
- src/share/mk/bsd.port.subdir.mk | 2 +-
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
---- a/ports/Mk/bsd.port.mk
-+++ b/ports/Mk/bsd.port.mk
-@@ -3400,7 +3400,7 @@
- .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
- @if [ -f "${AUDITFILE}" ]; then \
- audit_created=`${_EXTRACT_AUDITFILE} | \
-- ${SED} -nEe "1s/^#CREATED: *([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
-+ ${SED} -ne "1s/^#CREATED: *([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
- audit_expiry=`/bin/date -u -v-14d "+%Y%m%d"`; \
- if [ "$$audit_created" -lt "$$audit_expiry" ]; then \
- ${ECHO_MSG} "===> WARNING: Vulnerability database out of date, checking anyway"; \
-@@ -3504,7 +3504,7 @@
- @cd ${_DISTDIR};\
- ${_PATCH_SITES_ENV} ; \
- for _file in ${PATCHFILES}; do \
-- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
-+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
- select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- force_fetch=false; \
- filebasename=$${file##*/}; \
-@@ -4601,7 +4601,7 @@
- @(cd ${_DISTDIR}; \
- ${_MASTER_SITES_ENV} ; \
- for _file in ${DISTFILES}; do \
-- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
-+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
- select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -f $$file -a ! -f $${file##*/} ]; then \
- if [ ! -z "$$select" ] ; then \
-@@ -4638,7 +4638,7 @@
- @(cd ${_DISTDIR}; \
- ${_PATCH_SITES_ENV} ; \
- for _file in ${PATCHFILES}; do \
-- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
-+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
- select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -f $$file -a ! -f $${file##*/} ]; then \
- if [ ! -z "$$select" ] ; then \
-@@ -4674,7 +4674,7 @@
- @(cd ${_DISTDIR}; \
- ${_MASTER_SITES_ENV}; \
- for _file in ${DISTFILES}; do \
-- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
-+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
- fileptn=`${ECHO_CMD} $$file | ${SED} 's|/|\\\\/|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \
- select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
-@@ -4706,7 +4706,7 @@
- @(cd ${_DISTDIR}; \
- ${_PATCH_SITES_ENV} ; \
- for _file in ${PATCHFILES}; do \
-- file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
-+ file=`${ECHO_CMD} $$_file | ${SED} -e 's/:[^:]+$$//'` ; \
- fileptn=`${ECHO_CMD} $$file | ${SED} 's|/|\\\\/|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \
- select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
- if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
-@@ -5091,7 +5091,7 @@
- .if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
- @for i in ${LIB_DEPENDS}; do \
- lib=$${i%%:*}; \
-- pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
-+ pattern="`${ECHO_CMD} $$lib | ${SED} -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
- dir=$${i#*:}; \
- target=$${i##*:}; \
- if ${TEST} $$dir = $$target; then \
-@@ -5355,7 +5355,7 @@
- .endif
-
- BUILD-DEPENDS-LIST= \
-- for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \
-+ for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \
- if [ -d $$dir ]; then \
- ${ECHO_CMD} $$dir; \
- else \
-@@ -5643,7 +5643,7 @@
- done
- @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
- .endif
-- @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \
-+ @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \
- ${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \
- done
- .endfor
-@@ -5698,7 +5698,7 @@
- add-plist-docs:
- .if defined(PORTDOCS) && !defined(NOPORTDOCS)
- @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
-- [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
-+ [ "`${SED} -n -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
- ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
- fi
- .for x in ${PORTDOCS}
-@@ -5721,7 +5721,7 @@
- add-plist-examples:
- .if defined(PORTEXAMPLES) && !defined(NOPORTEXAMPLES)
- @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
-- [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
-+ [ "`${SED} -n -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
- ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
- fi
- .for x in ${PORTEXAMPLES}
-@@ -5745,7 +5745,7 @@
- add-plist-data:
- .if defined(PORTDATA) && !defined(NOPORTDATA)
- @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
-- [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
-+ [ "`${SED} -n -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
- ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
- fi
- .for x in ${PORTDATA}
---- a/src/share/mk/bsd.port.mk
-+++ b/src/share/mk/bsd.port.mk
-@@ -1,6 +1,6 @@
- # $FreeBSD$
-
--PORTSDIR?= /usr/ports
-+PORTSDIR?= /usr/share
- BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk
-
- # Needed to keep bsd.own.mk from reading in /etc/src.conf
---- a/src/share/mk/bsd.port.subdir.mk
-+++ b/src/share/mk/bsd.port.subdir.mk
-@@ -1,6 +1,6 @@
- # $FreeBSD$
-
--PORTSDIR?= /usr/ports
-+PORTSDIR?= /usr/share
- BSDPORTSUBDIRMK?= ${PORTSDIR}/Mk/bsd.port.subdir.mk
-
- .include "${BSDPORTSUBDIRMK}"
Modified: trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -15,7 +15,7 @@
.endfor
.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
!exists(${SYSDIR}/conf/kmod.mk)
--.error "can't find kernel source tree"
+-.error Unable to locate the kernel source tree. Set SYSDIR to override.
+.error "can't find kernel headers, install kfreebsd-headers-${KVER} package"
.endif
Deleted: trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/19_fix_cmd_pathnames.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,136 +0,0 @@
---- a/ports/Mk/bsd.commands.mk
-+++ b/ports/Mk/bsd.commands.mk
-@@ -20,35 +20,35 @@
-
- AWK?= /usr/bin/awk
- BASENAME?= /usr/bin/basename
--BRANDELF?= /usr/bin/brandelf
--BZCAT?= /usr/bin/bzcat
--BZIP2_CMD?= /usr/bin/bzip2
-+BRANDELF?= /usr/bin/freebsd-brandelf
-+BZCAT?= /bin/cat
-+BZIP2_CMD?= /bin/bzip2
- CAT?= /bin/cat
--CHGRP?= /usr/bin/chgrp
-+CHGRP?= /bin/chgrp
- CHMOD?= /bin/chmod
--CHOWN?= /usr/sbin/chown
-+CHOWN?= /bin/chown
- CHROOT?= /usr/sbin/chroot
- COMM?= /usr/bin/comm
- CP?= /bin/cp
--CPIO?= /usr/bin/cpio
-+CPIO?= /bin/cpio
- CUT?= /usr/bin/cut
- DC?= /usr/bin/dc
- DIALOG?= /usr/bin/dialog
- DIFF?= /usr/bin/diff
- DIRNAME?= /usr/bin/dirname
--EGREP?= /usr/bin/egrep
--EXPR?= /bin/expr
-+EGREP?= /bin/grep
-+EXPR?= /usr/bin/expr
- FALSE?= false # Shell builtin
- FILE?= /usr/bin/file
- FIND?= /usr/bin/find
- FLEX?= /usr/bin/flex
- FMT?= /usr/bin/fmt
- GMAKE?= gmake
--GREP?= /usr/bin/grep
--GUNZIP_CMD?= /usr/bin/gunzip -f
--GZCAT?= /usr/bin/gzcat
-+GREP?= /bin/grep
-+GUNZIP_CMD?= /usr/bin/unzip -f
-+GZCAT?= /bin/cat
- GZIP?= -9
--GZIP_CMD?= /usr/bin/gzip -nf ${GZIP}
-+GZIP_CMD?= /bin/gzip -nf ${GZIP}
- HEAD?= /usr/bin/head
- ID?= /usr/bin/id
- IDENT?= /usr/bin/ident
-@@ -56,8 +56,8 @@
- LN?= /bin/ln
- LS?= /bin/ls
- MKDIR?= /bin/mkdir -p
--MKTEMP?= /usr/bin/mktemp
--MOUNT?= /sbin/mount
-+MKTEMP?= /bin/mktemp
-+MOUNT?= /bin/mount
- MOUNT_DEVFS?= ${MOUNT} -t devfs devfs
- # XXX: this is a work-around for an obscure bug where
- # mount -t nullfs returns zero status on errors within
-@@ -67,27 +67,27 @@
- OBJCOPY?= /usr/bin/objcopy
- OBJDUMP?= /usr/bin/objdump
- PASTE?= /usr/bin/paste
--PAX?= /bin/pax
-+PAX?= /usr/bin/pax
- PRINTF?= /usr/bin/printf
- PW?= /usr/sbin/pw
--REALPATH?= /bin/realpath
-+REALPATH?= /bin/readlink -f
- RM?= /bin/rm
- RMDIR?= /bin/rmdir
--SED?= /usr/bin/sed
-+SED?= /bin/sed
- SETENV?= /usr/bin/env
- SH?= /bin/sh
- SORT?= /usr/bin/sort
- STRIP_CMD?= /usr/bin/strip
- # Command to run commands as privileged user
- # Example: "/usr/local/bin/sudo sh -c" to use "sudo" instead of "su"
--SU_CMD?= /usr/bin/su root -c
--SYSCTL?= /sbin/sysctl
-+SU_CMD?= /bin/su root -c
-+SYSCTL?= /bin/sysctl
- TAIL?= /usr/bin/tail
- TEST?= test # Shell builtin
- TR?= LANG=C /usr/bin/tr
- TRUE?= true # Shell builtin
- UMOUNT?= /sbin/umount
--UNAME?= /usr/bin/uname
-+UNAME?= /bin/uname
- UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself
- UNZIP_CMD?= ${LOCALBASE}/bin/unzip
- WHICH?= /usr/bin/which
-@@ -113,18 +113,4 @@
- # Used to print all the '===>' style prompts - override this to turn them off.
- ECHO_MSG?= ${ECHO_CMD}
-
--.if exists(${LOCALBASE}/sbin/pkg_info)
--PKG_CMD?= ${LOCALBASE}/sbin/pkg_create
--PKG_ADD?= ${LOCALBASE}/sbin/pkg_add
--PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete
--PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
--PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version
--.else
--PKG_CMD?= /usr/sbin/pkg_create
--PKG_ADD?= /usr/sbin/pkg_add
--PKG_DELETE?= /usr/sbin/pkg_delete
--PKG_INFO?= /usr/sbin/pkg_info
--PKG_VERSION?= /usr/sbin/pkg_version
--.endif
--
- .endif
---- a/ports/Mk/bsd.port.mk
-+++ b/ports/Mk/bsd.port.mk
-@@ -1121,7 +1121,7 @@
- # tree we are and thus can't go relative. They can, of course, be overridden
- # by individual Makefiles or local system make configuration.
- PORTSDIR?= /usr/ports
--LOCALBASE?= /usr/local
-+LOCALBASE?= /usr
- X11BASE?= ${LOCALBASE}
- LINUXBASE?= /compat/linux
- DISTDIR?= ${PORTSDIR}/distfiles
---- a/src/usr.bin/make/Makefile
-+++ b/src/usr.bin/make/Makefile
-@@ -39,7 +39,7 @@
- # not the trailing '\0', via the -l flag in emitc and some editing
- # (only for directive_hash).
-
--LOCALBASE ?= /usr/local
-+LOCALBASE ?= /usr
- MPH ?= ${LOCALBASE}/bin/mph
- EMITC ?= ${LOCALBASE}/bin/emitc
-
Modified: trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,6 +1,6 @@
--- a/src/usr.bin/make/Makefile
+++ b/src/usr.bin/make/Makefile
-@@ -4,6 +4,7 @@
+@@ -6,6 +6,7 @@
PROG= make
CFLAGS+=-I${.CURDIR}
@@ -44,13 +44,3 @@
PROG= file2c
+LDADD+= -lbsd
.include <bsd.prog.mk>
---- a/src/usr.bin/yacc/Makefile
-+++ b/src/usr.bin/yacc/Makefile
-@@ -4,6 +4,7 @@
- PROG= yacc
- SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
- skeleton.c symtab.c verbose.c warshall.c
-+LDADD+= -lbsd
- SCRIPTS=yyfix.sh
- MAN= yacc.1 yyfix.1
- SIMLINKS= ${BINDIR}/yacc ${BINDIR}/byacc
Modified: trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,11 +1,12 @@
--- a/src/share/mk/bsd.sys.mk
+++ b/src/share/mk/bsd.sys.mk
-@@ -27,7 +27,7 @@
- #CFLAGS += -pedantic
- . if defined(WARNS)
- . if ${WARNS} >= 1
--CWARNFLAGS += -Wsystem-headers
+@@ -27,7 +27,8 @@
+ #CFLAGS+= -pedantic
+ .if defined(WARNS)
+ .if ${WARNS} >= 1
+-CWARNFLAGS+= -Wsystem-headers
+# Disabled (see #664242)
- . if !defined(NO_WERROR)
- CWARNFLAGS += -Werror
- . endif
++#CWARNFLAGS+= -Wsystem-headers
+ .if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
+ ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
+ CWARNFLAGS+= -Werror
Added: trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -0,0 +1,11 @@
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
+@@ -639,7 +639,7 @@
+
+ .if ${MK_CTF} != "no"
+ CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+-.elif ${MAKE_VERSION} >= 5201111300
++.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
+ CTFCONVERT_CMD=
+ .else
+ CTFCONVERT_CMD= @:
Deleted: trunk/freebsd-buildutils/debian/patches/make_foreign.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/make_foreign.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/make_foreign.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,42 +0,0 @@
-
-Map foreign architecture names to FreeBSD naming convention.
-
-Patch from upstream (SVN rev 230392).
-
---- a/src/usr.bin/make/main.c
-+++ b/src/usr.bin/make/main.c
-@@ -146,6 +146,14 @@
- time_t now; /* Time at start of make */
- struct GNode *DEFAULT; /* .DEFAULT node */
-
-+static struct {
-+ const char *foreign_name;
-+ const char *freebsd_name;
-+} arch_aliases[] = {
-+ { "x86_64", "amd64" },
-+ { "mipsel", "mips" },
-+};
-+
- /**
- * Exit with usage message.
- */
-@@ -939,10 +947,19 @@
- */
- if ((machine = getenv("MACHINE")) == NULL) {
- static struct utsname utsname;
-+ unsigned int i;
-
- if (uname(&utsname) == -1)
- err(2, "uname");
- machine = utsname.machine;
-+
-+ /* Canonicalize non-FreeBSD naming conventions */
-+ for (i = 0; i < sizeof(arch_aliases)
-+ / sizeof(arch_aliases[0]); i++)
-+ if (!strcmp(machine, arch_aliases[i].foreign_name)) {
-+ machine = arch_aliases[i].freebsd_name;
-+ break;
-+ }
- }
-
- if ((machine_arch = getenv("MACHINE_ARCH")) == NULL) {
Deleted: trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,24 +0,0 @@
-
-Cherry-picked from upstream SVN rev 232322
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -414,6 +414,7 @@
- BIND_LIBS \
- BIND_SIGCHASE \
- BIND_XML \
-+ CLANG_IS_CC \
- CTF \
- HESIOD \
- ICONV \
-@@ -564,6 +565,10 @@
- MK_GDB:= no
- .endif
-
-+.if ${MK_CLANG} == "no"
-+MK_CLANG_IS_CC:= no
-+.endif
-+
- #
- # Set defaults for the MK_*_SUPPORT variables.
- #
Deleted: trunk/freebsd-buildutils/debian/patches/mk_ctf.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_ctf.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/mk_ctf.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,120 +0,0 @@
-
-Backport from upstream rev 228158.
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -203,6 +203,7 @@
- # regardless of user's setting).
- #
- .for var in \
-+ CTF \
- INSTALLLIB \
- MAN \
- PROFILE
-@@ -410,6 +411,7 @@
- BIND_LIBS \
- BIND_SIGCHASE \
- BIND_XML \
-+ CTF \
- HESIOD \
- ICONV \
- IDEA \
-@@ -506,6 +508,7 @@
-
- .if ${MK_CDDL} == "no"
- MK_ZFS:= no
-+MK_CTF:= no
- .endif
-
- .if ${MK_CRYPT} == "no"
-@@ -606,6 +609,12 @@
- .endif
- .endfor
-
-+.if ${MK_CTF} != "no"
-+CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-+.else
-+CTFCONVERT_CMD= @:
-+.endif
-+
- .endif # !_WITHOUT_SRCCONF
-
- .endif # !target(__<bsd.own.mk>__)
---- a/src/share/mk/bsd.lib.mk
-+++ b/src/share/mk/bsd.lib.mk
-@@ -33,15 +33,10 @@
- NO_WERROR=
- .endif
-
--# Enable CTF conversion on request.
--.if defined(WITH_CTF)
--.undef NO_CTF
--.endif
--
- .if defined(DEBUG_FLAGS)
- CFLAGS+= ${DEBUG_FLAGS}
-
--.if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "")
-+.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
- .endif
-@@ -202,9 +197,9 @@
- -o ${.TARGET} -Wl,-soname,${SONAME} \
- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
- .endif
-- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
-- (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
-- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
-+.if ${MK_CTF} != "no"
-+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-+.endif
- .endif
-
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
---- a/src/share/mk/bsd.prog.mk
-+++ b/src/share/mk/bsd.prog.mk
-@@ -15,16 +15,11 @@
- NO_WERROR=
- .endif
-
--# Enable CTF conversion on request.
--.if defined(WITH_CTF)
--.undef NO_CTF
--.endif
--
- .if defined(DEBUG_FLAGS)
- CFLAGS+=${DEBUG_FLAGS}
- CXXFLAGS+=${DEBUG_FLAGS}
-
--.if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "")
-+.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
- .endif
-@@ -60,9 +55,9 @@
- .else
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
- .endif
-- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
-- (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} && \
-- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS})
-+.if ${MK_CTF} != "no"
-+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
-+.endif
-
- .else # !defined(SRCS)
-
-@@ -90,9 +85,9 @@
- .else
- ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
- .endif
-- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
-- (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} && \
-- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS})
-+.if ${MK_CTF} != "no"
-+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
-+.endif
- .endif
-
- .endif
Deleted: trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,27 +0,0 @@
-
-Cherry-picked from upstream SVN rev 230972
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -317,6 +317,9 @@
- BOOT \
- BSD_CPIO \
- BSNMP \
-+ SOURCELESS \
-+ SOURCELESS_HOST \
-+ SOURCELESS_UCODE \
- BZIP2 \
- CALENDAR \
- CDDL \
-@@ -506,6 +509,11 @@
- MK_BIND_ETC:= no
- .endif
-
-+.if ${MK_SOURCELESS} == "no"
-+MK_SOURCELESS_HOST:= no
-+MK_SOURCELESS_UCODE:= no
-+.endif
-+
- .if ${MK_CDDL} == "no"
- MK_ZFS:= no
- MK_CTF:= no
Modified: trunk/freebsd-buildutils/debian/patches/nostrip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/nostrip.diff 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/nostrip.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -2,17 +2,6 @@
By default, install without -s. Let dh_strip, etc handle stripping
(and honor DEB_BUILD_OPTIONS=nostrip, etc).
---- a/ports/Mk/bsd.port.subdir.mk
-+++ b/ports/Mk/bsd.port.subdir.mk
-@@ -55,7 +55,7 @@
- .MAIN: all
-
- .if !defined(DEBUG_FLAGS)
--STRIP?= -s
-+#STRIP?= -s
- .endif
-
- # These are variables that are invariant for the lifetime of a recursive port traversal
--- a/src/share/mk/bsd.lib.mk
+++ b/src/share/mk/bsd.lib.mk
@@ -42,7 +42,7 @@
Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/patches/series 2012-06-16 10:17:44 UTC (rev 4312)
@@ -1,9 +1,9 @@
# Patches from (or merged in) upstream
-make_foreign.diff
-mk_ctf.diff
-mk_sourceless.diff
-mk_clang_is_cc.diff
+# Patches that are in good shape for merging upstream
+make_bootstrap_fix.diff
+yacc_is_byacc.diff
+
# Other patches
00_upstream.diff
01_make_fixes.diff
@@ -11,12 +11,10 @@
04_lex_disable_unused.diff
05_disable_hardlinks.diff
08_maxpathlen.diff
-09_ports_path.diff
15_manpages_gzip.diff
16_bootstrap_pmake.diff
#17_multiarch.diff
18_fix_sysdir.diff
-19_fix_cmd_pathnames.diff
21_endian.diff
22_ld_as_needed.diff
disable_wsystem_headers.diff
Added: trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2012-06-16 10:17:44 UTC (rev 4312)
@@ -0,0 +1,11 @@
+--- a/src/share/mk/sys.mk
++++ b/src/share/mk/sys.mk
+@@ -137,7 +137,7 @@
+
+ SHELL ?= sh
+
+-YACC ?= yacc
++YACC ?= byacc
+ .if defined(%POSIX)
+ YFLAGS ?=
+ .else
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2012-06-15 21:14:41 UTC (rev 4311)
+++ trunk/freebsd-buildutils/debian/rules 2012-06-16 10:17:44 UTC (rev 4312)
@@ -36,18 +36,15 @@
major := $(shell echo $(version) | sed -e 's/\..*//g')
revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-SVN := http://svn.freebsd.org/base/release/$(version).0
+#SVN := http://svn.freebsd.org/base/release/$(version).0
#SVN := http://svn.freebsd.org/base/releng/$(version)
#SVN := http://svn.freebsd.org/base/stable/$(major)
-#SVN := http://svn.freebsd.org/base/head
+SVN := http://svn.freebsd.org/base/head
SOURCE = freebsd-buildutils
ORIGDIR = $(SOURCE)-$(tar_version)
TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
-PCVS = anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-PTAG = RELEASE_$(pversion)_0
-
export CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
-DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
-DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
@@ -60,7 +57,7 @@
PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
PMAKE_BOOTSTRAP = $(CURDIR)/build-tree/src/usr.bin/make/pmake $(PMAKE_FLAGS)
PMAKE = $(CURDIR)/build-tree/src/usr.bin/make/make $(PMAKE_FLAGS)
-YACC = $(CURDIR)/build-tree/src/usr.bin/yacc/yacc
+YACC = byacc
package = $(SOURCE)
@@ -74,32 +71,20 @@
usr.bin/lex \
usr.bin/make \
usr.bin/mkdep \
- usr.bin/yacc \
usr.bin/brandelf \
usr.sbin/btxld \
usr.sbin/kgzip \
usr.sbin/mtree \
; do \
- svn export $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
+ svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
done
- cd $(ORIGDIR); cvs -d $(PCVS) export -r $(PTAG) ports/Mk ; cd ..
tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
rm -rf $(ORIGDIR)
unpack: unpack-stamp
unpack-stamp:
mkdir build-tree
- cp -a src ports build-tree/
- set -e ; for i in \
- build-tree/ports/Mk/bsd.port.mk \
- build-tree/ports/Mk/bsd.port.subdir.mk \
- ; do sed -i $$i \
- -e "s,/usr/bin/,,g" \
- -e "s,/usr/sbin/,,g" \
- -e "s,/bin/,,g" \
- -e "s,/sbin/,,g" \
- -e "s,/usr/ports,/usr/share/$(package)/ports,g" \
- ; done
+ cp -a src build-tree/
touch unpack-stamp
@@ -112,8 +97,6 @@
$(MAKE) -C build-tree/src/usr.bin/make -f Makefile.dist mostlyclean
$(PMAKE_BOOTSTRAP) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/make
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/yacc
-
$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/cksum
cd build-tree/src/usr.bin/lex ; \
@@ -134,7 +117,7 @@
dh_prep
dh_installdirs
- for i in cksum lex make mkdep yacc file2c brandelf ; do \
+ for i in cksum lex make mkdep file2c brandelf ; do \
$(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \
DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
done
@@ -145,9 +128,6 @@
$(PMAKE) -C build-tree/src/share/mk install \
DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/share
- cp -af $(CURDIR)/build-tree/ports/Mk \
- $(CURDIR)/debian/$(package)/usr/share/
-
# remove trash
rm -rf $(CURDIR)/debian/$(package)/usr/include \
$(CURDIR)/debian/$(package)/var
More information about the Glibc-bsd-commits
mailing list