patches/afterstep-02-sharedlib.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 259 2d2f33910c8e
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
259
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     1
diff -ur AfterStep-2.2.5-orig/autoconf/Makefile.common.lib.in AfterStep-2.2.5/autoconf/Makefile.common.lib.in
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     2
--- AfterStep-2.2.5-orig/autoconf/Makefile.common.lib.in	2007-04-21 05:10:45.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     3
+++ AfterStep-2.2.5/autoconf/Makefile.common.lib.in	2007-04-28 14:54:56.940641247 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     4
@@ -245,8 +245,8 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     5
 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     6
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     7
 $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     8
-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     9
-	 $(LIB_OBJS)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    10
+	$(CC) -Wl,-G,-h,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    11
+	 $(LIB_OBJS) $(USER_LD_FLAGS) $(LIBS_ALL)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    12
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    13
 install:	install.lib install.bin
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    14
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    15
diff -ur AfterStep-2.2.5-orig/autoconf/configure.in AfterStep-2.2.5/autoconf/configure.in
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    16
--- AfterStep-2.2.5-orig/autoconf/configure.in	2007-04-24 04:17:11.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    17
+++ AfterStep-2.2.5/autoconf/configure.in	2007-04-28 14:10:35.486922756 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    18
@@ -144,7 +144,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    19
   if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    20
     CFLAGS="$CFLAGS -fPIC"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    21
   fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    22
-  LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    23
 fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    24
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    25
 dnl# Add -g
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    26
diff -ur AfterStep-2.2.5-orig/autoconf/configure.libs.in AfterStep-2.2.5/autoconf/configure.libs.in
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    27
--- AfterStep-2.2.5-orig/autoconf/configure.libs.in	2005-03-22 23:10:50.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    28
+++ AfterStep-2.2.5/autoconf/configure.libs.in	2007-04-28 14:10:24.006460177 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    29
@@ -116,9 +116,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    30
   CFLAGS="$CFLAGS -Wuninitialized -Wwrite-strings -Wcast-qual -Wbad-function-cast -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wconversion -Wcomment -Wcast-align -Winline -Wshadow -Wredundant-decls -Wid-clash-31"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    31
 fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    32
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    33
-if test "x$GCC" = "xyes"; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    34
-   LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    35
-fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    36
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    37
 dnl# done with flags - lets export those for our children to use :
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    38
 export CFLAGS
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    39
diff -ur AfterStep-2.2.5-orig/configure AfterStep-2.2.5/configure
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    40
--- AfterStep-2.2.5-orig/configure	2007-04-24 04:17:11.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    41
+++ AfterStep-2.2.5/configure	2007-04-28 15:15:14.431259619 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    42
@@ -3197,7 +3197,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    43
   if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    44
     CFLAGS="$CFLAGS -fPIC"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    45
   fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    46
-  LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    47
 fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    48
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    49
 STRIP_BINARIES=
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    50
diff -ur AfterStep-2.2.5-orig/libAfterBase/Makefile.in AfterStep-2.2.5/libAfterBase/Makefile.in
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    51
--- AfterStep-2.2.5-orig/libAfterBase/Makefile.in	2007-04-21 05:10:45.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    52
+++ AfterStep-2.2.5/libAfterBase/Makefile.in	2007-04-28 15:18:03.176642692 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    53
@@ -325,7 +325,7 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    54
 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    55
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    56
 $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    57
-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    58
+	$(CC) -Wl,-G,-h,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    59
 	 $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    60
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    61
 install:	install.lib
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    62
diff -ur AfterStep-2.2.5-orig/libAfterBase/configure AfterStep-2.2.5/libAfterBase/configure
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    63
--- AfterStep-2.2.5-orig/libAfterBase/configure	2007-04-24 04:17:11.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    64
+++ AfterStep-2.2.5/libAfterBase/configure	2007-04-28 15:15:03.495068645 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    65
@@ -2468,7 +2468,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    66
       if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    67
 		CFLAGS="$CFLAGS -fPIC"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    68
 	  fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    69
-	  LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    70
 	fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    71
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    72
 else
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    73
diff -ur AfterStep-2.2.5-orig/libAfterBase/configure.in AfterStep-2.2.5/libAfterBase/configure.in
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    74
--- AfterStep-2.2.5-orig/libAfterBase/configure.in	2007-04-24 04:17:11.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    75
+++ AfterStep-2.2.5/libAfterBase/configure.in	2007-04-28 14:10:48.455016197 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    76
@@ -74,7 +74,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    77
       if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    78
 		CFLAGS="$CFLAGS -fPIC"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    79
 	  fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    80
-	  LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    81
 	fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    82
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    83
 else
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    84
@@ -93,7 +92,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    85
       if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    86
 		CFLAGS="$CFLAGS -fPIC"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    87
 	  fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    88
-	  LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    89
 	fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    90
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    91
 	dnl# Add -g
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    92
diff -ur AfterStep-2.2.5-orig/libAfterImage/Makefile.in AfterStep-2.2.5/libAfterImage/Makefile.in
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    93
--- AfterStep-2.2.5-orig/libAfterImage/Makefile.in	2007-04-21 05:10:45.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    94
+++ AfterStep-2.2.5/libAfterImage/Makefile.in	2007-04-28 15:13:48.451534309 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    95
@@ -383,8 +383,8 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    96
 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    97
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    98
 $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    99
-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   100
-	 $(LIB_OBJS)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   101
+	$(CC) -Wl,-G,-h,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   102
+	 $(LIB_OBJS) $(USER_LD_FLAGS) $(LIBRARIES)
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   103
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   104
 install.man:
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   105
 		@if [ -d doc/man ] ; then \
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   106
diff -ur AfterStep-2.2.5-orig/libAfterImage/configure AfterStep-2.2.5/libAfterImage/configure
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   107
--- AfterStep-2.2.5-orig/libAfterImage/configure	2007-04-24 04:17:11.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   108
+++ AfterStep-2.2.5/libAfterImage/configure	2007-04-28 15:14:57.935903505 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   109
@@ -2628,7 +2628,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   110
   if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   111
   	CFLAGS="$CFLAGS -fPIC"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   112
   fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   113
-  LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   114
 fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   115
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   116
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   117
diff -ur AfterStep-2.2.5-orig/libAfterImage/configure.in AfterStep-2.2.5/libAfterImage/configure.in
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   118
--- AfterStep-2.2.5-orig/libAfterImage/configure.in	2007-04-24 04:17:12.000000000 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   119
+++ AfterStep-2.2.5/libAfterImage/configure.in	2007-04-28 14:09:53.534088916 +0700
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   120
@@ -75,7 +75,6 @@
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   121
   if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   122
   	CFLAGS="$CFLAGS -fPIC"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   123
   fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   124
-  LDFLAGS="$LDFLAGS -rdynamic"
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   125
 fi
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   126
 
2d2f33910c8e 2007-04-30 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
   127