View | Details | Raw Unified | Return to bug 225226 | Differences between
and this patch

Collapse All | Expand All

(-)print/qpdf/files/patch-libtests_build.mk (+8 lines)
Line 0 Link Here
1 
--- libtests/build.mk.orig	2018-01-31 08:32:14 UTC
2 
+++ libtests/build.mk
3 
@@ -43,4 +43,4 @@ $(foreach B,$(BINS_libtests),$(eval \
4
5 
 $(foreach B,$(BINS_libtests),$(eval \
6 
   libtests/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
7 
-	$(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS) $(LIBS_libqpdf))))
8 
+	$(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))))
(-)print/qpdf/files/patch-make_libtool.mk (+17 lines)
Lines 10-15 Link Here
10
10
11 
 OBJ=o
 11 
 OBJ=o
12 
 LOBJ=lo
 12 
 LOBJ=lo
13 
@@ -94,14 +94,14 @@ endef
14 
 define makelib
15 
 	$(LIBTOOL) --mode=link \
16 
 		$(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \
17 
-		 -o $(2) $(1) $(4) $(3) \
18 
+		 -o $(2) $(1) $(3) $(4) \
19 
 		 -rpath $(libdir) -version-info $(5):$(6):$(7) -no-undefined
20 
 endef
21
22 
 #                       1    2      3       4
23 
 # Usage: $(call makebin,objs,binary,ldflags,libs)
24 
 define makebin
25 
-	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(4) $(3)
26 
+	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4)
27 
 endef
28
29 
 # Install target
13 
@@ -112,14 +112,14 @@ install: all
 30 
@@ -112,14 +112,14 @@ install: all
14 
 	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
 31 
 	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
15 
 	./mkinstalldirs $(DESTDIR)$(docdir)
 32 
 	./mkinstalldirs $(DESTDIR)$(docdir)

Return to bug 225226