Re: [AD] proposed patch for nicer asm symbols exports

[Sam Hocevar <sam@xxxxxxxxxx>]

On Thu, Aug 05, 2004, Peter Wang wrote:

> You forgot to attach :)

   Woops. Here it is.

-- 
Sam.

--- allegro4.1-4.1.15.orig/aclocal.m4
+++ allegro4.1-4.1.15/aclocal.m4
@@ -172,7 +172,6 @@
       dnl Use libdl if found, else assume dl* functions in libc.
       AC_CHECK_LIB(dl, dlopen,
         [LIBS="-ldl $LIBS"])
-      LDFLAGS="-Wl,-export-dynamic $LDFLAGS"
     fi])
 fi
 ])
--- allegro4.1-4.1.15.orig/configure.in
+++ allegro4.1-4.1.15/configure.in
@@ -276,8 +276,8 @@
   allegro_static_libraries=yes
   _programs="statically linked $_programs"
 else
-  LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
-  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
+  LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so"
+  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -lm"
   LINK_WITH_STATIC_LIBS=no
   allegro_shared_libraries=yes
   _programs="dynamically linked $_programs"
@@ -316,15 +316,15 @@
 
   _libraries="$_libraries shared"
   if test "X$allegro_build_normal_library" = "Xyes"; then
-    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg-\$(shared_version).so lib/unix/liballeg_unsharable.a"
+    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballeg-\$(shared_version).so"
     _libraries="$_libraries release"
   fi
   if test "X$allegro_build_debugging_library" = "Xyes"; then
-    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd-\$(shared_version).so lib/unix/liballd_unsharable.a"
+    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballd-\$(shared_version).so"
     _libraries="$_libraries debug"
   fi
   if test "X$allegro_build_profiling_library" = "Xyes"; then
-    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp-\$(shared_version).so lib/unix/liballp_unsharable.a"
+    ALLEGRO_LIB_TARGETS="$ALLEGRO_LIB_TARGETS lib/unix/liballp-\$(shared_version).so"
     _libraries="$_libraries profile"
   fi
 fi
--- allegro4.1-4.1.15.orig/makefile.in
+++ allegro4.1-4.1.15/makefile.in
@@ -462,7 +462,6 @@
 	  if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
 	    echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
 	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
-	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
 	  fi; \
 	done
 	@if test -n "$(ALLEGRO_MODULE_TARGETS)"; then \
@@ -588,7 +587,6 @@
 uninstall-lib:
 	@echo "Uninstalling libraries..."
 	@for l in alleg alld allp; do \
-	  rm -f $(libdir)/lib$${l}_unsharable.a; \
 	  rm -f $(libdir)/lib$${l}.a; \
 	done
 	rm -f $(bindir)/allegro-config
--- allegro4.1-4.1.15.orig/misc/allegro-config.in
+++ allegro4.1-4.1.15/misc/allegro-config.in
@@ -180,9 +184,9 @@
 if test "$echo_libs" = "yes"; then
    libdirs=-L${exec_prefix}/lib
    if test "$static_libs" = "yes"; then
-      echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs
+      echo $libdirs $allegro_ldflags -l${lib_type} ${allegro_libs}
    else
-      echo $libdirs $allegro_ldflags -l${lib_type}-${version} -l${lib_type}_unsharable
+      echo $libdirs $allegro_ldflags -l${lib_type}-${version} ${allegro_libs}
    fi
 fi
 
--- allegro4.1-4.1.15.orig/misc/deplib.sh
+++ allegro4.1-4.1.15/misc/deplib.sh
@@ -37,7 +37,10 @@
 sharable_sources=`echo $sources | sed 's,[^.	 ]*\.s,,g'`
 sharable_sources=`echo $sharable_sources | sed 's,[	 ]*udummy\.c,,g'`
 unsharable_sources=`echo $sources | sed 's,[^.	 ]*\.[^s],,g'`
-unsharable_sources=`echo $unsharable_sources udummy.c`
+unsharable_sources=`echo $unsharable_sources`
+# Disable liballeg_unsharable under Debian
+sharable_sources="${sharable_sources} ${unsharable_sources}"
+unsharable_sources="udummy.c"
 
 objects=`echo $sources | sed 's,\.[^.	 ]*,,g'`
 sharable_objects=`echo $sharable_sources | sed 's,\.[^.	 ]*,,g'`
@@ -190,15 +193,15 @@
     # Normal library.
     echo "\$(OBJDIR)/alleg/$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
-      echo "	\$(COMPILE_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg/$name\$(OBJ)"
+      echo "	\$(COMPILE_NORMAL)  \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg/$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_NORMAL) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/alleg/$name\$(OBJ)"
     fi
     echo "\$(OBJDIR)/shared/alleg/$name\$(OBJ): \$(srcdir)/$file$includes"
     if test "$ext" = "c"; then
       echo "	\$(COMPILE_NORMAL) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alleg/$name\$(OBJ)"
     else
-      echo "	\$(COMPILE_S_NORMAL) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alleg/$name\$(OBJ)"
+      echo "	\$(COMPILE_S_NORMAL) \$(ALLEGRO_SHAREDLIB_CFLAGS) -c \$(srcdir)/$file -o \$(OBJDIR)/shared/alleg/$name\$(OBJ)"
     fi
     echo ""