head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.66 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.64 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.62 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.60 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.58 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.56 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.54 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.52 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.50 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.48 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.46 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.44 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.42 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.40 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.38 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.36 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.34 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.32 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.30 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.28 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.26 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.24 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.22 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.20 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.16 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.18 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.14 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.12 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.10 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.8 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.6 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.4 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.2 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.1.0.50 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.48 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.44 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.42 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.40 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.38 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.36 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.34 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.32 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.30 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.28 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.26 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.24 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.22 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.20 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.18 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.16 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.14 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.12 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.10 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.8 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.6 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.4 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.2 pkgsrc-2012Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2018.01.25.13.01.23; author jperkin; state Exp; branches; next 1.1; commitid frO26plsrmBv0goA; 1.1 date 2012.02.15.15.25.15; author hans; state Exp; branches; next ; desc @@ 1.2 log @xorg-cf-files: Use correct compiler to linker flags. Bump PKGREVISION. @ text @$NetBSD: patch-sv4Lib.rules,v 1.1 2012/02/15 15:25:15 hans Exp $ --- sv4Lib.rules.orig 2015-12-22 01:28:02.000000000 +0000 +++ sv4Lib.rules @@@@ -63,26 +63,50 @@@@ XCOMM $XFree86: xc/config/cf/sv4Lib.rule /* * InstallSharedLibrary - generate rules to install the shared library. */ +INSTALLMINORREV = true + #ifndef InstallSharedLibrary #if StripInstalledPrograms # define InstallSharedLibrary(libname,rev,dest) @@@@\ install:: Concat(lib,libname.so.rev) @@@@\ MakeDir($(DESTDIR)dest) @@@@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@@@\ + T=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\ @@@@\ + if $(INSTALLMINORREV); then \ @@@@\ + INST=Concat(lib,libname.so.rev); \ @@@@\ + LINK=$$T; \ @@@@\ + else \ @@@@\ + INST=$$T; \ @@@@\ + fi; \ @@@@\ + (set -x; \ @@@@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) $$INST $(DESTDIR)dest); \ @@@@\ mcs -d Concat($(DESTDIR)dest/lib,libname.so.rev) @@@@\ - @@if $(SOSYMLINK); then (set -x; \ @@@@\ + if [ X"$$LINK" != X ]; then (set -x; \ @@@@\ + $(RM) $(DESTDIR)dest/$$LINK; \ @@@@\ + $(LN) $$INST $(DESTDIR)dest/$$LINK); \ @@@@\ + fi; \ @@@@\ + if $(SOSYMLINK); then (set -x; \ @@@@\ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@@@\ - cd $(DESTDIR)dest; \ @@@@\ - $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)); fi + $(LN) $$T Concat($(DESTDIR)dest/lib,libname.so)); fi #else # define InstallSharedLibrary(libname,rev,dest) @@@@\ install:: Concat(lib,libname.so.rev) @@@@\ MakeDir($(DESTDIR)dest) @@@@\ - $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@@@\ - @@if $(SOSYMLINK); then (set -x; \ @@@@\ + T=`echo Concat(lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\ @@@@\ + if $(INSTALLMINORREV); then \ @@@@\ + INST=Concat(lib,libname.so.rev); \ @@@@\ + LINK=$$T; \ @@@@\ + else \ @@@@\ + INST=$$T; \ @@@@\ + fi; \ @@@@\ + (set -x; \ @@@@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) $$INST $(DESTDIR)dest); \ @@@@\ + if [ X"$$LINK" != X ]; then (set -x; \ @@@@\ + $(RM) $(DESTDIR)dest/$$LINK; \ @@@@\ + $(LN) $$INST $(DESTDIR)dest/$$LINK); \ @@@@\ + fi; \ @@@@\ + if $(SOSYMLINK); then (set -x; \ @@@@\ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@@@\ - cd $(DESTDIR)dest; \ @@@@\ - $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)); fi + $(LN) $$T Concat($(DESTDIR)dest/lib,libname.so)); fi #endif #endif /* InstallSharedLibrary */ @@@@ -97,17 +121,17 @@@@ install:: Concat(lib,libname.so.rev) #ifndef LinkWithExports # if UseExportLists # define LinkWithExports(libname,rev,solist,down,up) \ - (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@@~ $(SHLIBLDFLAGS) -h $@@ solist $(REQUIREDLIBS)) @@@@\ + (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@@~ $(SHLIBLDFLAGS) -Wl,-h,$@@ solist $(REQUIREDLIBS)) @@@@\ if [ -f Concat(lib,libname.elist) ]; then \ @@@@\ $(RM) down/$@@.exports $@@.list; \ @@@@\ $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@@.list; \ @@@@\ $(EXPORTLISTGEN) $@@~ $@@.list > down/$@@.exports; \ @@@@\ - (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@@~ $(SHLIBLDFLAGS) -h $@@ ShlibExportListOpt($@@.exports) solist $(REQUIREDLIBS)); \ @@@@\ + (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@@~ $(SHLIBLDFLAGS) -Wl,-h,$@@ ShlibExportListOpt($@@.exports) solist $(REQUIREDLIBS)); \ @@@@\ $(RM) down/$@@.exports $@@.list; \ @@@@\ fi; # else # define LinkWithExports(libname,rev,solist,down,up) \ - (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@@~ $(SHLIBLDFLAGS) -h $@@ solist $(REQUIREDLIBS)) + (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@@~ $(SHLIBLDFLAGS) -Wl,-h,$@@ solist $(REQUIREDLIBS)) # endif #endif @ 1.1 log @Change SunOS definitions to be more compatible with what is used on other platforms: - use similar library installation rules - use CC, CXX and CFLAGS from pkgsrc @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- sv4Lib.rules.orig 2009-10-16 23:45:42.000000000 +0200 +++ sv4Lib.rules 2012-01-15 22:45:33.359398571 +0100 d64 21 @