diff options
Diffstat (limited to 'x11/xview-config/patches/patch-ad')
| -rw-r--r-- | x11/xview-config/patches/patch-ad | 60 |
1 files changed, 48 insertions, 12 deletions
diff --git a/x11/xview-config/patches/patch-ad b/x11/xview-config/patches/patch-ad index 20d5ec10373..be81b13e387 100644 --- a/x11/xview-config/patches/patch-ad +++ b/x11/xview-config/patches/patch-ad @@ -1,9 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2000/09/13 20:21:54 jlam Exp $ - ---- XView.rules.orig Tue Jun 29 01:13:20 1993 -+++ XView.rules -@@ -141,6 +141,23 @@ - * included in both the .so and the .sa parts of the library. +$NetBSD: patch-ad,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $ + +--- ./XView.rules.orig Tue Jun 29 01:13:20 1993 ++++ ./XView.rules Tue May 1 22:40:32 2001 +@@ -142,4 +142,21 @@ */ #ifndef SubdirBuildNormalSharedLibraryTarget +#if UseElfFormat == YES @@ -25,17 +24,55 @@ $NetBSD: patch-ad,v 1.5 2000/09/13 20:21:54 jlam Exp $ +#else #define SubdirBuildNormalSharedLibraryTarget(libname,rev,solist,sodir) @@\ AllTarget(lib/**/libname.so.rev) @@\ - @@\ -@@ -156,6 +173,7 @@ - clean:: @@\ +@@ -157,4 +174,5 @@ $(RM) lib/**/libname.so.rev sodir/?*.o strings* +#endif #endif /* SubdirBuildNormalSharedLibraryTarget */ +@@ -246,6 +264,7 @@ + .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:: @@\ +@@ -257,22 +276,24 @@ + /* -@@ -366,9 +384,9 @@ - #ifndef InstallSharedLibraryNoBuild +- * 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 $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c @@\ ++ $(CC) -c $(PIC) $(SHAREDCODEDEF) \ @@\ ++ $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c @@\ ++ $(CP) $*.o shared/$*.o @@\ + @@\ + clean:: @@\ +@@ -367,7 +388,7 @@ #define InstallSharedLibraryNoBuild(libname,rev,dest) @@\ install:: @@\ - $(RM) /dest/lib/**/libname.so @@\ @@ -45,4 +82,3 @@ $NetBSD: patch-ad,v 1.5 2000/09/13 20:21:54 jlam Exp $ + (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so) #endif /* InstallSharedLibraryNoBuild */ - |