CVS commit: pkgsrc/mk

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Aug  7 23:54:09 UTC 2017

Modified Files:
        pkgsrc/mk/build: bsd.build-vars.mk
        pkgsrc/mk/platform: NetBSD.mk README

Log Message:
Remove hack working around NetBSD 1.5's specfiles.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mk/build/bsd.build-vars.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mk/platform/NetBSD.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/platform/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/build/bsd.build-vars.mk
diff -u pkgsrc/mk/build/bsd.build-vars.mk:1.11 pkgsrc/mk/build/bsd.build-vars.mk:1.12
--- pkgsrc/mk/build/bsd.build-vars.mk:1.11      Sun Apr 10 15:58:02 2016
+++ pkgsrc/mk/build/bsd.build-vars.mk   Mon Aug  7 23:54:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build-vars.mk,v 1.11 2016/04/10 15:58:02 joerg Exp $
+# $NetBSD: bsd.build-vars.mk,v 1.12 2017/08/07 23:54:09 maya Exp $
 #
 # Package-settable variables:
 #
@@ -32,7 +32,6 @@ MAKE_FILE?=   Makefile
 
 MAKE_ENV+=     ${ALL_ENV}
 MAKE_ENV+=     ${NO_EXPORT_CPP:D:UCPP=${CPP:Q}}
-MAKE_ENV+=     LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
 MAKE_ENV+=     LOCALBASE=${LOCALBASE:Q}
 MAKE_ENV+=     X11BASE=${X11BASE:Q}
 MAKE_ENV+=     PKGMANDIR=${PKGMANDIR:Q}

Index: pkgsrc/mk/platform/NetBSD.mk
diff -u pkgsrc/mk/platform/NetBSD.mk:1.54 pkgsrc/mk/platform/NetBSD.mk:1.55
--- pkgsrc/mk/platform/NetBSD.mk:1.54   Mon Aug  7 23:44:53 2017
+++ pkgsrc/mk/platform/NetBSD.mk        Mon Aug  7 23:54:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.54 2017/08/07 23:44:53 maya Exp $
+# $NetBSD: NetBSD.mk,v 1.55 2017/08/07 23:54:09 maya Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -84,12 +84,6 @@ _PATCH_CAN_BACKUP=   yes     # native patch(1)
 _PATCH_BACKUP_ARG?=    -V simple --suffix # switch to patch(1) for backup suffix
 _USE_RPATH=            yes     # add rpath to LDFLAGS
 
-# for programs which use dlopen()
-# not necessary since 1.6 (shared libs are linked against libgcc_pic)
-.if !empty(OS_VERSION:M1.5*)
-LINK_ALL_LIBGCC_HACK=  -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
-.endif
-
 _STRIPFLAG_CC?=                ${_INSTALL_UNSTRIPPED:D:U-s}    # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U-s}    # install(1) option to strip
 

Index: pkgsrc/mk/platform/README
diff -u pkgsrc/mk/platform/README:1.5 pkgsrc/mk/platform/README:1.6
--- pkgsrc/mk/platform/README:1.5       Thu Mar 10 16:58:19 2016
+++ pkgsrc/mk/platform/README   Mon Aug  7 23:54:09 2017
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.5 2016/03/10 16:58:19 jperkin Exp $
+$NetBSD: README,v 1.6 2017/08/07 23:54:09 maya Exp $
 
 These files contain platform-specific definitions that are used by the
 pkgsrc infrastructure.
@@ -91,8 +91,6 @@ TODO: Document all these variables.
 
     _USE_RPATH is "yes" to add rpath to LDFLAGS, otherwise "no"
 
-    LINK_ALL_LIBGCC_HACK
-
     _STRIPFLAG_CC is cc(1) option to strip.
 
     _STRIPFLAG_INSTALL is install(1) option to strip.