summaryrefslogtreecommitdiff
path: root/devel/amulet/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'devel/amulet/files/patch-aa')
-rw-r--r--devel/amulet/files/patch-aa24
1 files changed, 19 insertions, 5 deletions
diff --git a/devel/amulet/files/patch-aa b/devel/amulet/files/patch-aa
index 071d2594da0b..0365ed00fd3e 100644
--- a/devel/amulet/files/patch-aa
+++ b/devel/amulet/files/patch-aa
@@ -1,6 +1,19 @@
---- bin/Makefile.lib.gcc.shared.orig Mon Jun 23 21:37:02 1997
-+++ bin/Makefile.lib.gcc.shared Mon May 11 22:48:44 1998
-@@ -27,6 +27,7 @@
+--- bin/Makefile.lib.gcc.shared.orig Mon Jun 23 07:37:02 1997
++++ bin/Makefile.lib.gcc.shared Tue Oct 13 19:59:34 1998
+@@ -15,8 +15,11 @@
+ ORE_LIB=$(LIB_DIR)/$(ORE_lib).so
+ AMULET_LIB=$(LIB_DIR)/$(AMULET_lib).so
+
++.if $(PORTOBJFORMAT) == "elf"
++V=$(AM_MAJOR_VERSION)
++.else
+ V=$(AM_MAJOR_VERSION).$(AM_MINOR_VERSION)
+-
++.endif
+
+ BAD_VERSION=gcc version 2\.[56]\.[0-9]
+
+@@ -27,6 +30,7 @@
echo "*** or upgrade to gcc 2.7.0 or later." ; \
echo "" ; false ; \
} fi
@@ -8,12 +21,13 @@
FULL_AMULET_DEPENDENCIES = \
$(OPAL_MODULE) $(INTER_MODULE) $(DEBUG_MODULE) \
-@@ -49,26 +50,22 @@
+@@ -49,26 +53,23 @@
$(AMULET_LIB):: $(AMULET_LIB_DEPENDENCIES)
$(SHARED_CC) $(AM_CFLAGS) $(FULL_AMULET_DEPENDENCIES) \
-o $(LIB_DIR)/$(AMULET_lib).so.$(V)
- cd $(LIB_DIR); for p in $(AMULET_lib).sl $(AMULET_lib).so ; \
- do rm -f $$p ; ln -s $(AMULET_lib).so.$(V) $$p ; done
++ ln -sf $(AMULET_lib).so.$(V) $(AMULET_LIB)
+ touch $(AMULET_LIB)
$(GEM_LIB): $(GEM_LIB_DEPENDENCIES)
@@ -39,7 +53,7 @@
# Use these declarations to compile tests against monolithic shared libs.
-@@ -91,4 +88,4 @@
+@@ -91,4 +92,4 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
.cc.o: