Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 152 → Rev 153

/trunk/debian/changelog
1,3 → 1,13
prayer (1.3.5-dfsg1-2) unstable; urgency=low
 
* dlopen_templates.patch: Use MYCFLAGS (which is initialized to the
value of CFLAGS from dpkg-buildflags in the Config file) instead of
CFLAGS in templates/{src,cam,old}/Makefile (Closes: #715310, LP:
#1201216). The --defsym options were lost when we let CDBS override
CFLAGS in the previous upload.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 18 Jul 2013 22:47:08 +0200
 
prayer (1.3.5-dfsg1-1) unstable; urgency=low
 
* New upstream release.
/trunk/debian/patches/dlopen_templates.patch
50,12 → 50,12
-CFLAGS = $(BASECFLAGS)
-LDFLAGS = $(BASELDFLAGS)
+CFLAGS = $(BASECFLAGS) -fPIC
+LDFLAGS = $(BASELDFLAGS) -fPIC
+MYCFLAGS = $(BASECFLAGS) -fPIC
+MYLDFLAGS = $(BASELDFLAGS) -fPIC
+LDFLAGS_TEMPLATELIB = \
+ -Wl,--defsym=template_map=template_map_$(TYPE) \
+ -Wl,--defsym=template_map_count=template_map_$(TYPE)_count
+LDFLAGS += $(LDFLAGS_TEMPLATELIB)
+MYLDFLAGS += $(LDFLAGS_TEMPLATELIB)
TYPE=cam
64,19 → 64,22
T_FILES_FRONTEND=login.t login_hermes.t \
frontend_login_error.t frontend_security.t frontend_session.t \
@@ -111,6 +115,12 @@ templates.a: $(O_FILES)
@@ -111,8 +115,14 @@ templates.a: $(O_FILES)
rm -f templates.a
ar q templates.a $(O_FILES)
+$(TYPE)_frontend.so: $(O_FILES_FRONTEND)
+ $(CC) $(LDFLAGS) -shared -o $@ $(O_FILES_FRONTEND)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES_FRONTEND)
+
+$(TYPE).so: $(O_FILES)
+ $(CC) $(LDFLAGS) -shared -o $@ $(O_FILES)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES)
+
%.o: %.c Makefile
$(CC) $(CFLAGS) -I../../lib -c $<
- $(CC) $(CFLAGS) -I../../lib -c $<
+ $(CC) $(MYCFLAGS) -I../../lib -c $<
_template_index_frontend.c:
../src/build_index.pl $(TYPE) $(T_FILES_FRONTEND) > _template_index_frontend.c
@@ -129,6 +139,10 @@ install:
cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
96,12 → 99,12
-CFLAGS = $(BASECFLAGS)
-LDFLAGS = $(BASELDFLAGS)
+CFLAGS = $(BASECFLAGS) -fPIC
+LDFLAGS = $(BASELDFLAGS) -fPIC
+MYCFLAGS = $(BASECFLAGS) -fPIC
+MYLDFLAGS = $(BASELDFLAGS) -fPIC
+LDFLAGS_TEMPLATELIB = \
+ -Wl,--defsym=template_map=template_map_$(TYPE) \
+ -Wl,--defsym=template_map_count=template_map_$(TYPE)_count
+LDFLAGS += $(LDFLAGS_TEMPLATELIB)
+MYLDFLAGS += $(LDFLAGS_TEMPLATELIB)
TYPE=old
110,19 → 113,22
T_FILES_FRONTEND=login.t \
frontend_login_error.t frontend_security.t frontend_session.t \
@@ -110,6 +114,12 @@ templates.a: $(O_FILES)
@@ -110,8 +114,14 @@ templates.a: $(O_FILES)
rm -f templates.a
ar q templates.a $(O_FILES)
+$(TYPE)_frontend.so: $(O_FILES_FRONTEND)
+ $(CC) $(LDFLAGS) -shared -o $@ $(O_FILES_FRONTEND)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES_FRONTEND)
+
+$(TYPE).so: $(O_FILES)
+ $(CC) $(LDFLAGS) -shared -o $@ $(O_FILES)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES)
+
%.o: %.c Makefile
$(CC) $(CFLAGS) -I../../lib -c $<
- $(CC) $(CFLAGS) -I../../lib -c $<
+ $(CC) $(MYCFLAGS) -I../../lib -c $<
_template_index_frontend.c:
../src/build_index.pl $(TYPE) $(T_FILES_FRONTEND) > _template_index_frontend.c
@@ -128,6 +138,10 @@ install:
cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)