head 1.1; access; symbols pkgsrc-2026Q3:1.1.0.122 pkgsrc-2026Q3-base:1.1 pkgsrc-2026Q2:1.1.0.120 pkgsrc-2026Q2-base:1.1 pkgsrc-2026Q1:1.1.0.118 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.116 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.114 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.112 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.110 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.108 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.106 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.104 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.102 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.100 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.98 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.96 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.94 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.92 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.90 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.88 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.86 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.84 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.82 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.80 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.78 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.76 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.74 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.70 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.50 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.72 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.68 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.66 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.64 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.62 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.60 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.58 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.56 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.54 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.52 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.48 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.46 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.44 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.42 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.40 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.38 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.36 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.34 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.32 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.30 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.28 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.26 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.24 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.22 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.20 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.18 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.16 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.14 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.12 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.10 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.8 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.6 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2 pkgsrc-2011Q3-base:1.1; locks; strict; comment @# @; 1.1 date 2011.08.11.05.50.37; author dholland; state Exp; branches; next ; desc @@ 1.1 log @Reorganize the patches here by topic. @ text @$NetBSD$ Assorted minor modernizations to the build system. - Install all icons and other images by default. By modern standards they're small. - Make the default compiler flag for PIC -fPIC, which will work without further fuss in the largest number of environments. - Support ELF as well as legacy a.out linking, using $(CC) instead of $(LD) to link in order to get the proper startup files for a library. - Write suffix rules that work properly with current make dialects. - Some adjoining cosmetic fixups. --- XView.cf Thu Aug 11 01:06:50 2011 -0400 +++ XView.cf Thu Aug 11 01:19:01 2011 -0400 @@@@ -259,7 +259,7 @@@@ * following variable to YES. */ #ifndef InstallAllImages -#define InstallAllImages NO +#define InstallAllImages YES #endif /* * If you do not already have the textsw extras menu installed in @@@@ -358,9 +358,11 @@@@ * PositionIndependentCodeFlag should be defined as -K PIC * If you are running 4.x, then PositionIndependentCodeFlag should * be defined as -PIC + * For gcc and most gcc-like modern compilers this should be -fPIC, + * so that'll be the default. */ #ifndef PositionIndependentCodeFlag -#define PositionIndependentCodeFlag -PIC +#define PositionIndependentCodeFlag -fPIC #endif /* --- XView.rules Thu Aug 11 01:06:50 2011 -0400 +++ XView.rules Thu Aug 11 01:19:01 2011 -0400 @@@@ -141,6 +141,23 @@@@ * included in both the .so and the .sa parts of the library. */ #ifndef SubdirBuildNormalSharedLibraryTarget +#if UseElfFormat == YES +#define SubdirBuildNormalSharedLibraryTarget(libname,rev,solist,sodir) @@@@\ +AllTarget(lib/**/libname.so.rev) @@@@\ + @@@@\ +lib/**/libname.so.rev:: solist @@@@\ + $(RM) $@@~ sodir/lib/**/libname.so.xs.o @@@@\ + @@if [ -f xstrings ]; then \ @@@@\ + $(RM) strings; $(CP) xstrings strings; fi @@@@\ + (cd sodir; $(CC) -o ../$@@~ $(SHLIBLDFLAGS) ?*.o) @@@@\ + -@@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi @@@@\ + $(RM) $@@ @@@@\ + $(MV) $@@~ $@@ @@@@\ + @@@@\ +clean:: @@@@\ + $(RM) lib/**/libname.so.rev sodir/?*.o strings* + +#else #define SubdirBuildNormalSharedLibraryTarget(libname,rev,solist,sodir) @@@@\ AllTarget(lib/**/libname.so.rev) @@@@\ @@@@\ @@@@ -156,6 +173,7 @@@@ clean:: @@@@\ $(RM) lib/**/libname.so.rev sodir/?*.o strings* +#endif #endif /* SubdirBuildNormalSharedLibraryTarget */ /* @@@@ -245,8 +263,9 @@@@ @@@@\ .c.o: @@@@\ $(RM) $@@ shared/$@@ @@@@\ - $(CC) $(PIC) $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) $(STRCONST) -c $*.c \ @@@@\ - -o shared/$*.o @@@@\ + $(CC) -c $(PIC) $(SHAREDCODEDEF) \ @@@@\ + $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c @@@@\ + $(CP) $*.o shared/$*.o @@@@\ @@@@\ clean:: @@@@\ $(RM) strings* @@@@\ @@@@ -256,24 +275,26 @@@@ #endif /* SubdirSharedLibraryObjectRule */ /* - * SubdirSharedAndDebuggedLibraryObjectRule - generate make rules to build shared, - * debuggable, and "normal" object files. + * SubdirSharedAndDebuggedLibraryObjectRule - generate make rules to + * build shared, debuggable, and "normal" object files. */ #ifndef SubdirSharedAndDebuggedLibraryObjectRule -#define SubdirSharedAndDebuggedLibraryObjectRule() @@@@\ +#define SubdirSharedAndDebuggedLibraryObjectRule() @@@@\ all:: @@@@\ -@@if [ ! -d shared ]; then mkdir shared; else exit 0; fi @@@@\ -@@if [ ! -f $(XSTR_STRINGS_FILE) ]; then \ @@@@\ touch $(XSTR_STRINGS_FILE); else exit 0; fi @@@@\ - -@@if [ -f strings ]; then $(RM) strings; else exit 0; fi @@@@\ - $(LN) $(XSTR_STRINGS_FILE) strings @@@@\ + -@@if [ ! -f strings ]; then \ @@@@\ + $(LN) $(XSTR_STRINGS_FILE) strings; else exit 0; fi @@@@\ -@@if [ ! -d debugger ]; then mkdir debugger; else exit 0; fi @@@@\ @@@@\ .c.o: @@@@\ $(RM) $@@ shared/$@@ debugger/$@@ @@@@\ - $(CC) -g -c $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c @@@@\ + $(CC) -c -g $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c @@@@\ $(CP) $*.o debugger/$*.o @@@@\ - $(CC) -c $(PIC) $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c @@@@\ + $(CC) -c $(PIC) $(SHAREDCODEDEF) \ @@@@\ + $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c @@@@\ + $(CP) $*.o shared/$*.o @@@@\ @@@@\ clean:: @@@@\ $(RM) strings* @@@@\ @