[Glibc-bsd-commits] r5152 - in trunk/freebsd-buildutils/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Thu Nov 28 15:27:35 UTC 2013
Author: rmh
Date: 2013-11-23 14:58:13 +0000 (So, 23 lis 2013)
New Revision: 5152
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
trunk/freebsd-buildutils/debian/patches/mk_ncp.diff
trunk/freebsd-buildutils/debian/patches/nostrip.diff
Log:
* New upstream snapshot.
- Refresh all patches.
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2013-11-21 22:38:12 UTC (rev 5151)
+++ trunk/freebsd-buildutils/debian/changelog 2013-11-23 14:58:13 UTC (rev 5152)
@@ -1,8 +1,12 @@
-freebsd-buildutils (10~svn253832-2) UNRELEASED; urgency=low
+freebsd-buildutils (10~svn258496-1) UNRELEASED; urgency=low
+ * New upstream snapshot.
+ - Refresh all patches.
+
+ [ Guillem Jover ]
* Remove myself from Uploaders.
- -- Guillem Jover <guillem at debian.org> Wed, 16 Oct 2013 21:33:29 +0200
+ -- Robert Millan <rmh at debian.org> Sat, 23 Nov 2013 15:48:42 +0100
freebsd-buildutils (10~svn253832-1) unstable; urgency=low
Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2013-11-21 22:38:12 UTC (rev 5151)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2013-11-23 14:58:13 UTC (rev 5152)
@@ -65,7 +65,7 @@
.PHONY: ${INSTALLINFODIRS}
--- a/src/share/mk/bsd.lib.mk
+++ b/src/share/mk/bsd.lib.mk
-@@ -156,9 +156,9 @@
+@@ -168,9 +168,9 @@
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -77,7 +77,7 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -173,9 +173,9 @@
+@@ -185,9 +185,9 @@
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -89,7 +89,7 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -206,11 +206,11 @@
+@@ -218,11 +218,11 @@
.if !defined(NM)
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} \
@@ -103,20 +103,29 @@
.endif
.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -290,11 +290,11 @@
+@@ -302,11 +302,11 @@
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
+ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
.endif
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
+ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(SHLIB_NAME)
+@@ -343,7 +343,7 @@
+ sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
+ -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
+ ${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
+- ${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
++ ${INSTALL} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
+ ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
+ rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
--- a/src/share/mk/bsd.man.mk
+++ b/src/share/mk/bsd.man.mk
@@ -216,7 +216,7 @@
@@ -148,7 +157,7 @@
#
# BINMODE Binary mode. [555]
#
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@
#
# SHAREOWN ASCII text file owner. [root]
#
@@ -157,7 +166,7 @@
#
# SHAREMODE ASCII text file mode. [${NOBINMODE}]
#
-@@ -129,7 +129,7 @@
+@@ -131,7 +131,7 @@
# Binaries
BINOWN?= root
@@ -166,7 +175,7 @@
BINMODE?= 555
NOBINMODE?= 444
-@@ -159,7 +159,7 @@
+@@ -162,7 +162,7 @@
# Share files
SHAREDIR?= /usr/share
SHAREOWN?= root
@@ -175,7 +184,7 @@
SHAREMODE?= ${NOBINMODE}
CONFDIR?= /etc
-@@ -195,8 +195,8 @@
+@@ -198,8 +198,8 @@
HRDLINK?= -l h
SYMLINK?= -l s
Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2013-11-21 22:38:12 UTC (rev 5151)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2013-11-23 14:58:13 UTC (rev 5152)
@@ -4,7 +4,7 @@
--- a/src/share/mk/bsd.own.mk
+++ b/src/share/mk/bsd.own.mk
-@@ -203,7 +203,7 @@
+@@ -206,7 +206,7 @@
STRIP?= -s
.endif
Modified: trunk/freebsd-buildutils/debian/patches/mk_ncp.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_ncp.diff 2013-11-21 22:38:12 UTC (rev 5151)
+++ trunk/freebsd-buildutils/debian/patches/mk_ncp.diff 2013-11-23 14:58:13 UTC (rev 5152)
@@ -4,7 +4,7 @@
--- a/src/share/mk/bsd.own.mk
+++ b/src/share/mk/bsd.own.mk
-@@ -317,6 +317,7 @@
+@@ -314,6 +314,7 @@
MAILWRAPPER \
MAKE \
MAN \
@@ -12,7 +12,7 @@
NDIS \
NETCAT \
NETGRAPH \
-@@ -517,6 +518,10 @@
+@@ -516,6 +517,10 @@
MK_GROFF:= no
.endif
Modified: trunk/freebsd-buildutils/debian/patches/nostrip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/nostrip.diff 2013-11-21 22:38:12 UTC (rev 5151)
+++ trunk/freebsd-buildutils/debian/patches/nostrip.diff 2013-11-23 14:58:13 UTC (rev 5152)
@@ -15,7 +15,7 @@
.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
--- a/src/share/mk/bsd.own.mk
+++ b/src/share/mk/bsd.own.mk
-@@ -200,7 +200,7 @@
+@@ -203,7 +203,7 @@
# Common variables
.if !defined(DEBUG_FLAGS)
More information about the Glibc-bsd-commits
mailing list