Fri Oct 25 13:53:04 2013 UTC ()
Use the compiler front-end to generate shared libraries on OSX - the
native linker uses different arguments compared to GNU ld.  Fixes various
builds.

Bump version to 20131025.


(jperkin)
diff -r1.37 -r1.38 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -r1.3 -r1.4 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk
cvs diff -r1.37 -r1.38 pkgsrc/pkgtools/bootstrap-mk-files/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2013/09/12 10:56:36 1.37
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2013/10/25 13:53:03 1.38
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.37 2013/09/12 10:56:36 jperkin Exp $ 1# $NetBSD: Makefile,v 1.38 2013/10/25 13:53:03 jperkin Exp $
2 2
3DISTNAME= bootstrap-mk-files-20130912 3DISTNAME= bootstrap-mk-files-20131025
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8CONFLICTS+= mk-files-[0-9]* 8CONFLICTS+= mk-files-[0-9]*
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.pkgsrc.org/ 11HOMEPAGE= http://www.pkgsrc.org/
12COMMENT= *.mk files for the bootstrap bmake utility 12COMMENT= *.mk files for the bootstrap bmake utility
13 13
14NO_PKGTOOLS_REQD_CHECK= # defined 14NO_PKGTOOLS_REQD_CHECK= # defined
15BOOTSTRAP_PKG= yes 15BOOTSTRAP_PKG= yes
16 16
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk 2009/05/12 23:21:10 1.3
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk 2013/10/25 13:53:03 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.bsd.lib.mk,v 1.3 2009/05/12 23:21:10 minskim Exp $ 1# $NetBSD: Darwin.bsd.lib.mk,v 1.4 2013/10/25 13:53:03 jperkin Exp $
2# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 2# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
3 3
4.if !target(__initialized__) 4.if !target(__initialized__)
5__initialized__: 5__initialized__:
6.if exists(${.CURDIR}/../Makefile.inc) 6.if exists(${.CURDIR}/../Makefile.inc)
7.include "${.CURDIR}/../Makefile.inc" 7.include "${.CURDIR}/../Makefile.inc"
8.endif 8.endif
9.include <bsd.own.mk> 9.include <bsd.own.mk>
10.include <bsd.obj.mk> 10.include <bsd.obj.mk>
11.include <bsd.depall.mk> 11.include <bsd.depall.mk>
12.MAIN: all 12.MAIN: all
13.endif 13.endif
14 14
@@ -365,34 +365,34 @@ lib${LIB}.a:: ${OBJS} __archivebuild @@ -365,34 +365,34 @@ lib${LIB}.a:: ${OBJS} __archivebuild
365 @echo building standard ${LIB} library 365 @echo building standard ${LIB} library
366 366
367lib${LIB}_p.a:: ${POBJS} __archivebuild 367lib${LIB}_p.a:: ${POBJS} __archivebuild
368 @echo building profiled ${LIB} library 368 @echo building profiled ${LIB} library
369 369
370lib${LIB}_pic.a:: ${SOBJS} __archivebuild 370lib${LIB}_pic.a:: ${SOBJS} __archivebuild
371 @echo building shared object ${LIB} library 371 @echo building shared object ${LIB} library
372 372
373lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \ 373lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
374 ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} 374 ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
375 @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\) 375 @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
376 @rm -f lib${LIB}.so.${SHLIB_FULLVERSION} 376 @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
377.if defined(DESTDIR) 377.if defined(DESTDIR)
378 $(LD) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ 378 $(CC) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
379 ${SHLIB_LDSTARTFILE} \ 379 ${SHLIB_LDSTARTFILE} \
380 --whole-archive ${SOLIB} \ 380 --whole-archive ${SOLIB} \
381 --no-whole-archive ${LDADD} \ 381 --no-whole-archive ${LDADD} \
382 -L${DESTDIR}${LIBDIR} -R${LIBDIR} \ 382 -L${DESTDIR}${LIBDIR} -R${LIBDIR} \
383 ${SHLIB_LDENDFILE} 383 ${SHLIB_LDENDFILE}
384.else 384.else
385 $(LD) -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \ 385 $(CC) -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
386 ${SHLIB_LDSTARTFILE} \ 386 ${SHLIB_LDSTARTFILE} \
387 --whole-archive ${SOLIB} --no-whole-archive ${LDADD} \ 387 --whole-archive ${SOLIB} --no-whole-archive ${LDADD} \
388 ${SHLIB_LDENDFILE} 388 ${SHLIB_LDENDFILE}
389.endif 389.endif
390.if ${OBJECT_FMT} == "ELF" 390.if ${OBJECT_FMT} == "ELF"
391 ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp 391 ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp
392 mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR} 392 mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR}
393 ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp 393 ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp
394 mv -f lib${LIB}.so.tmp lib${LIB}.so 394 mv -f lib${LIB}.so.tmp lib${LIB}.so
395.endif 395.endif
396 396
397.if !empty(LOBJS) 397.if !empty(LOBJS)
398LLIBS?= -lc 398LLIBS?= -lc