Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 107 → Rev 106

/trunk/debian/patches/template_sdk.patch
88,14 → 88,13
+print "$name$suffix.so:", "_template_index$suffix.o", map {"$_.o"} @all;
--- /dev/null
+++ b/templates/src/template-set.make.in
@@ -0,0 +1,67 @@
@@ -0,0 +1,66 @@
+ifndef NAME
+NAME := $(notdir $(CURDIR))
+endif
+
+CPPFLAGS = -I/usr/include/prayer
+CFLAGS += -fPIC
+LDFLAGS_TEMPLATELIB = -shared -fPIC \
+LDFLAGS_TEMPLATELIB = -shared \
+ -Wl,--defsym=template_map=template_map_$(NAME) \
+ -Wl,--defsym=template_map_count=template_map_$(NAME)_count
+
/trunk/debian/patches/dlopen_templates.patch
44,14 → 44,10
+struct template_map_index *dlopen_templates(const char *set, const char *suffix);
--- a/templates/cam/Makefile
+++ b/templates/cam/Makefile
@@ -6,12 +6,16 @@ else
include ../../Config
endif
@@ -8,10 +8,14 @@ endif
-CFLAGS = $(BASECFLAGS)
-LDFLAGS = $(BASELDFLAGS)
+CFLAGS = $(BASECFLAGS) -fPIC
+LDFLAGS = $(BASELDFLAGS) -fPIC
CFLAGS = $(BASECFLAGS)
LDFLAGS = $(BASELDFLAGS)
+LDFLAGS_TEMPLATELIB = \
+ -Wl,--defsym=template_map=template_map_$(TYPE) \
+ -Wl,--defsym=template_map_count=template_map_$(TYPE)_count
90,14 → 86,10
--- a/templates/old/Makefile
+++ b/templates/old/Makefile
@@ -6,12 +6,16 @@ else
include ../../Config
endif
@@ -8,10 +8,14 @@ endif
-CFLAGS = $(BASECFLAGS)
-LDFLAGS = $(BASELDFLAGS)
+CFLAGS = $(BASECFLAGS) -fPIC
+LDFLAGS = $(BASELDFLAGS) -fPIC
CFLAGS = $(BASECFLAGS)
LDFLAGS = $(BASELDFLAGS)
+LDFLAGS_TEMPLATELIB = \
+ -Wl,--defsym=template_map=template_map_$(TYPE) \
+ -Wl,--defsym=template_map_count=template_map_$(TYPE)_count