Attachment 190221 Details for Bug 225226 – fix build with prev version installed

[patch] fix build with prev version installed

qpdf-7.1.0.patch (text/plain), 1.92 KB, created by Dmitri Goutnik on 2018-01-31 13:42:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2018-01-31 13:42:09 UTC

Size: 1.92 KB

patch

obsolete

>Index: print/qpdf/files/patch-libtests_build.mk
>===================================================================
>--- print/qpdf/files/patch-libtests_build.mk	(nonexistent)
>+++ print/qpdf/files/patch-libtests_build.mk	(working copy)
>@@ -0,0 +1,8 @@
>+--- libtests/build.mk.orig	2018-01-31 08:32:14 UTC
>++++ libtests/build.mk
>+@@ -43,4 +43,4 @@ $(foreach B,$(BINS_libtests),$(eval \
>+ 
>+ $(foreach B,$(BINS_libtests),$(eval \
>+   libtests/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
>+-	$(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS) $(LIBS_libqpdf))))
>++	$(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))))
>
>Property changes on: print/qpdf/files/patch-libtests_build.mk
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/qpdf/files/patch-make_libtool.mk
>===================================================================
>--- print/qpdf/files/patch-make_libtool.mk	(revision 460470)
>+++ print/qpdf/files/patch-make_libtool.mk	(working copy)
>@@ -10,6 +10,23 @@
>  
>  OBJ=o
>  LOBJ=lo
>+@@ -94,14 +94,14 @@ endef
>+ define makelib
>+ 	$(LIBTOOL) --mode=link \
>+ 		$(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \
>+-		 -o $(2) $(1) $(4) $(3) \
>++		 -o $(2) $(1) $(3) $(4) \
>+ 		 -rpath $(libdir) -version-info $(5):$(6):$(7) -no-undefined
>+ endef
>+ 
>+ #                       1    2      3       4
>+ # Usage: $(call makebin,objs,binary,ldflags,libs)
>+ define makebin
>+-	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(4) $(3)
>++	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4)
>+ endef
>+ 
>+ # Install target
> @@ -112,14 +112,14 @@ install: all
>  	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
>  	./mkinstalldirs $(DESTDIR)$(docdir)

Flags:

dmgk: maintainer-approval?

Actions: View | Diff

Attachments on bug 225226: 189806 | 190157 | 190221