[pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files Don't use ld -x or ld -X. ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files Don't use ld -x or ld -X. ...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:10:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/80e35e65cb02
branches:  trunk
changeset: 532032:80e35e65cb02
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Aug 10 13:04:13 2007 +0000

description:
Don't use ld -x or ld -X. Bump version to 20070810.

Discussed with and tested by various people over the last two month.
This problem was exposed by pbulk.

diffstat:

 pkgtools/bootstrap-mk-files/Makefile                      |   4 +-
 pkgtools/bootstrap-mk-files/files/bsd.lib.mk              |  32 ++++++------
 pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk  |  36 +++++++-------
 pkgtools/bootstrap-mk-files/files/mods/IRIX.bsd.lib.mk    |  36 +++++++-------
 pkgtools/bootstrap-mk-files/files/mods/Interix.bsd.lib.mk |  32 ++++++------
 pkgtools/bootstrap-mk-files/files/mods/Linux.bsd.lib.mk   |  36 +++++++-------
 6 files changed, 88 insertions(+), 88 deletions(-)

diffs (truncated from 757 to 300 lines):

diff -r a4652cbc65e5 -r 80e35e65cb02 pkgtools/bootstrap-mk-files/Makefile
--- a/pkgtools/bootstrap-mk-files/Makefile      Fri Aug 10 11:04:25 2007 +0000
+++ b/pkgtools/bootstrap-mk-files/Makefile      Fri Aug 10 13:04:13 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2007/04/12 14:36:40 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/08/10 13:04:13 joerg Exp $
 
-DISTNAME=      bootstrap-mk-files-20061111
+DISTNAME=      bootstrap-mk-files-20070810
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r a4652cbc65e5 -r 80e35e65cb02 pkgtools/bootstrap-mk-files/files/bsd.lib.mk
--- a/pkgtools/bootstrap-mk-files/files/bsd.lib.mk      Fri Aug 10 11:04:25 2007 +0000
+++ b/pkgtools/bootstrap-mk-files/files/bsd.lib.mk      Fri Aug 10 13:04:13 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.1.1.1 2006/07/14 23:13:00 jlam Exp $
+#      $NetBSD: bsd.lib.mk,v 1.2 2007/08/10 13:04:13 joerg Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -161,7 +161,7 @@
 .else
        @echo ${COMPILE.c:Q} ${.IMPSRC}
        @${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -181,7 +181,7 @@
 .else
        @echo ${COMPILE.c:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -194,7 +194,7 @@
 .else
        @echo ${COMPILE.cc:Q} ${.IMPSRC}
        @${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -214,7 +214,7 @@
 .else
        @echo ${COMPILE.cc:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -224,7 +224,7 @@
 .else
        @echo ${COMPILE.f:Q} ${.IMPSRC}
        @${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -234,7 +234,7 @@
 .else
        @echo ${COMPILE.f:Q} -pg ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -244,7 +244,7 @@
 .else
        @echo ${COMPILE.f:Q} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -257,7 +257,7 @@
 .else
        @echo ${COMPILE.m:Q} ${.IMPSRC}
        @${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -267,7 +267,7 @@
 .else
        @echo ${COMPILE.m:Q} -pg ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -277,26 +277,26 @@
 .else
        @echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
 .S.o .s.o:
        @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}
        @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .S.po .s.po:
        @echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .S.so .s.so:
        @echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
@@ -375,14 +375,14 @@
        @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
        @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)
-       $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+       $(LD) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
            ${SHLIB_LDSTARTFILE} \
            --whole-archive ${SOLIB} \
            --no-whole-archive ${LDADD} \
            -L${DESTDIR}${LIBDIR} ${RPATH_FLAG}${LIBDIR} \
            ${SHLIB_LDENDFILE}
 .else
-       $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+       $(LD) -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
            ${SHLIB_LDSTARTFILE} \
            --whole-archive ${SOLIB} --no-whole-archive ${LDADD} \
            ${SHLIB_LDENDFILE}
diff -r a4652cbc65e5 -r 80e35e65cb02 pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk  Fri Aug 10 11:04:25 2007 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk  Fri Aug 10 13:04:13 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Darwin.bsd.lib.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#      $NetBSD: Darwin.bsd.lib.mk,v 1.2 2007/08/10 13:04:13 joerg Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -161,7 +161,7 @@
 .else
        @echo ${COMPILE.c:Q} ${.IMPSRC}
        @${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -171,7 +171,7 @@
 .else
        @echo ${COMPILE.c:Q} -pg ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -181,7 +181,7 @@
 .else
        @echo ${COMPILE.c:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -194,7 +194,7 @@
 .else
        @echo ${COMPILE.cc:Q} ${.IMPSRC}
        @${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -204,7 +204,7 @@
 .else
        @echo ${COMPILE.cc:Q} -pg ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -214,7 +214,7 @@
 .else
        @echo ${COMPILE.cc:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -224,7 +224,7 @@
 .else
        @echo ${COMPILE.f:Q} ${.IMPSRC}
        @${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -234,7 +234,7 @@
 .else
        @echo ${COMPILE.f:Q} -pg ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -244,7 +244,7 @@
 .else
        @echo ${COMPILE.f:Q} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -257,7 +257,7 @@
 .else
        @echo ${COMPILE.m:Q} ${.IMPSRC}
        @${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -267,7 +267,7 @@
 .else
        @echo ${COMPILE.m:Q} -pg ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
@@ -277,26 +277,26 @@
 .else
        @echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 .endif
 
 .S.o .s.o:
        @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}
        @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .S.po .s.po:
        @echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .S.so .s.so:
        @echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
        @${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
-       @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
+       @${LD} -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
@@ -375,14 +375,14 @@
        @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
        @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)
-       $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+       $(LD) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
            ${SHLIB_LDSTARTFILE} \
            --whole-archive ${SOLIB} \
            --no-whole-archive ${LDADD} \
            -L${DESTDIR}${LIBDIR} -R${LIBDIR} \
            ${SHLIB_LDENDFILE}
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc regen.
Next by Date: [pkgsrc/trunk]: pkgsrc/audio/gnome-speech update to 0.4.16
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc regen.
Next by Thread: [pkgsrc/trunk]: pkgsrc/audio/gnome-speech update to 0.4.16
Indexes:
Home | Main Index | Thread Index | Old Index