diff options
Diffstat (limited to 'devel/allegro-devel/files')
-rw-r--r-- | devel/allegro-devel/files/patch-configure.in | 54 | ||||
-rw-r--r-- | devel/allegro-devel/files/patch-makefile.in | 96 | ||||
-rw-r--r-- | devel/allegro-devel/files/patch-misc::allegro-config.in | 11 | ||||
-rw-r--r-- | devel/allegro-devel/files/patch-misc::deplib.sh | 20 |
4 files changed, 0 insertions, 181 deletions
diff --git a/devel/allegro-devel/files/patch-configure.in b/devel/allegro-devel/files/patch-configure.in deleted file mode 100644 index 2d5542e78287..000000000000 --- a/devel/allegro-devel/files/patch-configure.in +++ /dev/null @@ -1,54 +0,0 @@ ---- configure.in.orig Sun Nov 9 19:43:06 2003 -+++ configure.in Thu Dec 11 22:22:35 2003 -@@ -256,8 +256,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 -@@ -286,13 +286,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) -@@ -647,11 +647,11 @@ - if test "X$allegro_debug_with_fortify" = "Xyes"; then - ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY" - fi -- ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" -+ ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -funroll-loops -ffast-math $WFLAGS" - if test "X$allegro_cv_support_fomit_frame_pointer" = "Xyes"; then -- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" -+ CFLAGS="$CFLAGS $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math -fomit-frame-pointer $WFLAGS" - else -- CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" -+ CFLAGS="$CFLAGS $TARGET_ARCH $CFLAGS -funroll-loops -ffast-math $WFLAGS" - fi - ALLEGRO_SFLAGS="-x assembler-with-cpp" - ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED" -@@ -740,7 +740,7 @@ - ${MAKE-make} depend - else - AC_MSG_WARN([Non-GNU make detected, trying gmake to build dependencies.]) -- gmake depend -+ ${MAKE-make} depend - fi - fi - diff --git a/devel/allegro-devel/files/patch-makefile.in b/devel/allegro-devel/files/patch-makefile.in deleted file mode 100644 index ffd14b923f9f..000000000000 --- a/devel/allegro-devel/files/patch-makefile.in +++ /dev/null @@ -1,96 +0,0 @@ ---- makefile.in.orig Sun Nov 9 19:43:06 2003 -+++ makefile.in Thu Dec 11 22:25:58 2003 -@@ -20,7 +20,7 @@ - mandir = @mandir@ - libdir = @libdir@ - modulebasedir = $(libdir)/allegro --moduledir = $(modulebasedir)/$(shared_major_minor) -+moduledir = $(modulebasedir)/$(shared_version) - - EXE = - OBJ = .o -@@ -29,12 +29,13 @@ - INFO_DIR = $(infodir)/dir - DESTDIR = - --ACLOCAL = aclocal --AUTOCONF = autoconf --AUTOHEADER = autoheader -+ACLOCAL = true -+AUTOCONF = true -+AUTOHEADER = true - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_INFO = @INSTALL_INFO@ - -@@ -325,6 +326,11 @@ - full-build: 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) - -@@ -436,35 +442,37 @@ - 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 $(DESTDIR)$(libdir); \ -- $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \ -+ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \ -+ echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \ -+ $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \ - $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \ - fi; \ - done - @if test -n "$(ALLEGRO_MODULE_TARGETS)"; then \ - $(mkinstalldirs) $(DESTDIR)$(moduledir); \ -- for m in $(ALLEGRO_MODULE_TARGETS) modules.lst; do \ -+ for m in $(ALLEGRO_MODULE_TARGETS); do \ - echo Installing $$m to $(DESTDIR)$(moduledir); \ -- $(INSTALL_DATA) $$m $(DESTDIR)$(moduledir)/; \ -+ $(INSTALL_PROGRAM) $$m $(DESTDIR)$(moduledir)/; \ - done; \ -+ echo Installing modules.lst to $(DESTDIR)$(moduledir); \ -+ $(INSTALL_DATA) modules.lst $(DESTDIR)$(moduledir)/; \ - fi - $(mkinstalldirs) $(DESTDIR)$(bindir) - @echo Installing allegro-config to $(DESTDIR)$(bindir) -- @$(INSTALL_PROGRAM) allegro-config $(DESTDIR)$(bindir) -- @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \ -- (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \ -- test $(libdir) = /lib || test $(libdir) = /usr/lib) \ -- && ($(LDCONFIG) $(libdir) || true) || (\ -- echo "" ; \ -- echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \ -- echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \ -- echo "$(libdir) each time you want to run an Allegro program." ; \ -- ) ; \ -- fi -+ @$(INSTALL_SCRIPT) allegro-config $(DESTDIR)$(bindir) -+# @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \ -+# (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \ -+# test $(libdir) = /lib || test $(libdir) = /usr/lib) \ -+# && ($(LDCONFIG) $(libdir) || true) || (\ -+# echo "" ; \ -+# echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \ -+# echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \ -+# echo "$(libdir) each time you want to run an Allegro program." ; \ -+# ) ; \ -+# fi - @for l in alleg alld allp; do \ -- if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \ -- (cd $(DESTDIR)$(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::allegro-config.in b/devel/allegro-devel/files/patch-misc::allegro-config.in deleted file mode 100644 index d060f8fd3641..000000000000 --- a/devel/allegro-devel/files/patch-misc::allegro-config.in +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/allegro-config.in.orig Wed Oct 23 08:10:01 2002 -+++ misc/allegro-config.in Mon Nov 11 18:41:09 2002 -@@ -167,7 +167,7 @@ - if test "$static_libs" = "yes"; then - 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} -l${lib_type}_unsharable - fi - fi - diff --git a/devel/allegro-devel/files/patch-misc::deplib.sh b/devel/allegro-devel/files/patch-misc::deplib.sh deleted file mode 100644 index 2e0a7b4f3e2d..000000000000 --- a/devel/allegro-devel/files/patch-misc::deplib.sh +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/deplib.sh.orig Sun Nov 9 19:43:07 2003 -+++ misc/deplib.sh Thu Dec 11 22:32:16 2003 -@@ -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} ${3} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_major_minor) \$(LIBS)" -+ echo " \$(CC) -shared -o \$@ ${shareobj} \$(LDFLAGS) -Wl,-h,lib${1}.so.\$(shared_version) \$(LIBS)" - echo "" - echo "\$(LIBDIR)/${unsharelib}: ${unshareobj}" - echo " rm -f \$@" |