diff options
Diffstat (limited to 'devel/allegro-devel/files')
-rw-r--r-- | devel/allegro-devel/files/patch-aclocal.m4 | 11 | ||||
-rw-r--r-- | devel/allegro-devel/files/patch-configure.in | 48 | ||||
-rw-r--r-- | devel/allegro-devel/files/patch-makefile.in | 56 | ||||
-rw-r--r-- | devel/allegro-devel/files/patch-misc::deplib.sh | 20 |
4 files changed, 107 insertions, 28 deletions
diff --git a/devel/allegro-devel/files/patch-aclocal.m4 b/devel/allegro-devel/files/patch-aclocal.m4 deleted file mode 100644 index 8c274f2926d..00000000000 --- a/devel/allegro-devel/files/patch-aclocal.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- aclocal.m4.orig Tue Oct 22 00:17:38 2002 -+++ aclocal.m4 Tue Oct 22 00:17:55 2002 -@@ -183,7 +183,7 @@ - allegro_support_modules=yes - dnl Use libdl if found, else assume dl* functions in libc. - AC_CHECK_LIB(dl, dlopen, -- [LIBS="-ldl $LIBS"]) -+ [LIBS="$LIBS"]) - LDFLAGS="-Wl,-export-dynamic $LDFLAGS" - fi]) - fi diff --git a/devel/allegro-devel/files/patch-configure.in b/devel/allegro-devel/files/patch-configure.in index 5bfe99de32e..3504cae06a0 100644 --- a/devel/allegro-devel/files/patch-configure.in +++ b/devel/allegro-devel/files/patch-configure.in @@ -1,5 +1,49 @@ ---- configure.in.orig Tue Oct 22 00:18:10 2002 -+++ configure.in Tue Oct 22 00:20:03 2002 +--- configure.in.orig Thu Jul 4 05:17:59 2002 ++++ configure.in Wed Nov 6 02:19:16 2002 +@@ -169,12 +169,12 @@ + TARGET_ARCH= + fi + if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then +- CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" ++ CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" + else +- CFLAGS="$TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" ++ CFLAGS="$TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS" + fi + ALLEGRO_DEBUG_CFLAGS="-g $WFLAGS -DDEBUGMODE" +- ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" ++ ALLEGRO_PROFILE_CFLAGS="-pg $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS" + if test "$allegro_cv_support_asm" != i386; then + CFLAGS="$CFLAGS -DALLEGRO_USE_C" + ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DALLEGRO_USE_C" +@@ -226,8 +226,8 @@ + LINK_WITH_STATIC_LIBS=yes + allegro_static_libraries=yes + 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}.so.\$(shared_version) lib/unix/lib${LIB_TO_LINK}_unsharable.a" ++ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK} -l${LIB_TO_LINK}_unsharable -lm" + LINK_WITH_STATIC_LIBS=no + allegro_shared_libraries=yes + fi +@@ -254,13 +254,13 @@ + fi + if test "X$allegro_shared_libraries" = "Xyes"; then + 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.so.\$(shared_version) lib/unix/liballeg_unsharable.a" + 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.so.\$(shared_version) lib/unix/liballd_unsharable.a" + 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.so.\$(shared_version) lib/unix/liballp_unsharable.a" + fi + fi + AC_SUBST(ALLEGRO_LIB_TARGETS) @@ -504,7 +504,7 @@ ${MAKE-make} depend else diff --git a/devel/allegro-devel/files/patch-makefile.in b/devel/allegro-devel/files/patch-makefile.in index 36e512e4f03..e4a8c951e1c 100644 --- a/devel/allegro-devel/files/patch-makefile.in +++ b/devel/allegro-devel/files/patch-makefile.in @@ -1,15 +1,45 @@ ---- makefile.in.orig Thu Jul 4 04:20:02 2002 -+++ makefile.in Tue Oct 22 00:31:27 2002 -@@ -31,7 +31,7 @@ - ACLOCAL = aclocal +--- makefile.in.orig Thu Jul 4 05:20:02 2002 ++++ makefile.in Wed Nov 6 02:02:31 2002 +@@ -28,10 +28,10 @@ + LIBDIR = lib/unix + INFO_DIR = $(infodir)/dir + +-ACLOCAL = aclocal ++ACLOCAL = true ACLOCAL_M4 = $(srcdir)/aclocal.m4 - AUTOCONF = autoconf +-AUTOCONF = autoconf -AUTOHEADER = autoheader -+AUTOHEADER = autoheader213 ++AUTOCONF = true ++AUTOHEADER = true INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -347,17 +347,17 @@ +@@ -249,6 +249,11 @@ + all: lib modules programs docs + + lib: $(ALLEGRO_LIB_TARGETS) ++ @for l in alleg alld allp; do \ ++ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \ ++ ln -sf lib$${l}.so.$(shared_version) $(LIBDIR)/lib$${l}.so; \ ++ fi; \ ++ done + + modules: $(ALLEGRO_MODULE_TARGETS) + +@@ -332,9 +337,9 @@ + fi; \ + done + @for l in alleg alld allp; do \ +- if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \ +- echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(libdir); \ +- $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(libdir)/; \ ++ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \ ++ echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \ ++ $(INSTALL_DATA) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \ + $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(libdir)/; \ + fi; \ + done +@@ -347,20 +352,20 @@ fi $(mkinstalldirs) $(bindir) @echo Installing allegro-config to $(bindir) @@ -36,14 +66,10 @@ +# ) ; \ +# fi @for l in alleg alld allp; do \ - if test -f $(libdir)/lib$${l}-$(shared_version).so -a \! -L $(libdir)/lib$${l}.so.${shared_major_minor}; then \ - (cd $(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \ -@@ -395,7 +395,7 @@ - @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \ - if test "X`echo $$prog | sed -e s,tools/.\*,,`" = X; then \ - echo Installing $$prog to $(bindir); \ -- $(INSTALL_PROGRAM) $$prog $(bindir); \ -+ $(INSTALL) $$prog $(bindir); \ +- if test -f $(libdir)/lib$${l}-$(shared_version).so -a \! -L $(libdir)/lib$${l}.so.${shared_major_minor}; then \ +- (cd $(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \ ++ if test -f $(libdir)/lib$${l}.so.$(shared_version) -a \! -L $(libdir)/lib$${l}.so; then \ ++ (cd $(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \ fi; \ done diff --git a/devel/allegro-devel/files/patch-misc::deplib.sh b/devel/allegro-devel/files/patch-misc::deplib.sh new file mode 100644 index 00000000000..499f6d447aa --- /dev/null +++ b/devel/allegro-devel/files/patch-misc::deplib.sh @@ -0,0 +1,20 @@ +--- misc/deplib.sh.orig Thu Jul 4 05:18:01 2002 ++++ misc/deplib.sh Tue Nov 5 22:56:54 2002 +@@ -10,7 +10,7 @@ + staticlib="lib${1}.a" + staticobj="\$(${2}_OBJECTS)" + +- sharelib="lib${1}-\$(shared_version).so" ++ sharelib="lib${1}.so.\$(shared_version)" + shareobj="\$(${2}_SHARED_OBJECTS)" + + unsharelib="lib${1}_unsharable.a" +@@ -24,7 +24,7 @@ + echo " rm -f \$@" + # gf: This bit is obviously gcc-specific + # eb: Yes, but the GNU C Compiler doesn't always spell 'gcc' +- echo " \$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-soname,lib${1}.so.\$(shared_major_minor) \$(LIBS)" ++ echo " \$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-soname,lib${1}.so.\$(shared_version) \$(LIBS)" + echo "" + echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}" + echo " rm -f \$@" |