Blame adime-2.2.1-so-fixes.patch
|
 |
9c5b966 |
--- adime-2.2.1/misc/makefile.uni.soname 2004-09-10 21:34:54.000000000 +0200
|
|
|
9c5b966 |
+++ adime-2.2.1/misc/makefile.uni 2006-03-12 09:23:54.000000000 +0100
|
|
|
9c5b966 |
@@ -53,7 +53,7 @@
|
|
|
9c5b966 |
|
|
|
9c5b966 |
# link as a shared object
|
|
|
9c5b966 |
OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5)
|
|
|
9c5b966 |
-IMPLIB_BASENAME = lib$(PACKAGE5).so
|
|
|
9c5b966 |
+IMPLIB_BASENAME = lib$(PACKAGE5).so.0
|
|
|
9c5b966 |
IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME)
|
|
|
9c5b966 |
LIB_NAME = $(IMPLIB_NAME)
|
|
|
9c5b966 |
|
|
|
9c5b966 |
@@ -153,7 +153,11 @@
|
|
|
9c5b966 |
SFLAGS = $(WFLAGS)
|
|
|
9c5b966 |
ifndef SYMBOLMODE
|
|
|
9c5b966 |
LFLAGS += -s
|
|
|
9c5b966 |
-LIB_FLAGS = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)`
|
|
|
9c5b966 |
+# allegro-config --libs drags in -lalleg_unshareable, which is non-PIC
|
|
|
9c5b966 |
+# and thus should only be in the application not a .so file. This means all
|
|
|
9c5b966 |
+# applications which use adime must be linked with:
|
|
|
9c5b966 |
+# -Wl,--export-dynamic -lalleg_unsharable (or `allegro-config --libs`)
|
|
|
9c5b966 |
+LIB_FLAGS= $(shell allegro-config --libs | sed 's/-lalleg_unsharable//')
|
|
|
9c5b966 |
endif
|
|
|
9c5b966 |
endif
|
|
|
9c5b966 |
endif
|
|
|
9c5b966 |
@@ -236,7 +240,7 @@
|
|
|
9c5b966 |
|
|
|
9c5b966 |
LINK_LIB_DEPS =
|
|
|
9c5b966 |
define LINK_LIB
|
|
|
9c5b966 |
-gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS)
|
|
|
9c5b966 |
+gcc $(LFLAGS) -shared -Wl,-soname=$(IMPLIB_BASENAME) -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS)
|
|
|
9c5b966 |
endef
|
|
|
9c5b966 |
|
|
|
9c5b966 |
LINK_EXE_DEPS =
|
|
|
9c5b966 |
@@ -270,7 +274,7 @@
|
|
|
9c5b966 |
|
|
|
9c5b966 |
$(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
|
|
|
9c5b966 |
install -m 755 -d $(SYSTEM_LIB_DIR)
|
|
|
9c5b966 |
- install -m 644 $< $@
|
|
|
9c5b966 |
+ install -m 755 $< $@
|
|
|
9c5b966 |
|
|
|
9c5b966 |
$(SYSTEM_INCLUDE_DIR)/adime.h: include/adime.h
|
|
|
9c5b966 |
install -m 755 -d $(SYSTEM_INCLUDE_DIR)
|