diff options
author | joerg <joerg@pkgsrc.org> | 2015-04-02 21:23:22 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2015-04-02 21:23:22 +0000 |
commit | 9814ac1cfd7f0e28d1bfaeb41b5bbdb9476ad0b5 (patch) | |
tree | ef2907e88942f9f11e5f84fb9740202e11fca80e /misc | |
parent | dd26002a851eaf39b69b3fc345fa8bd18044e2e9 (diff) | |
download | pkgsrc-9814ac1cfd7f0e28d1bfaeb41b5bbdb9476ad0b5.tar.gz |
Don't create shared object symlinks pointing to libtool archives,
they confuse the linker.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/fbreader/distinfo | 8 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-zlibrary_core_Makefile | 13 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-zlibrary_text_Makefile | 13 | ||||
-rw-r--r-- | misc/fbreader/patches/patch-zlibrary_ui_Makefile | 13 |
4 files changed, 28 insertions, 19 deletions
diff --git a/misc/fbreader/distinfo b/misc/fbreader/distinfo index b4eb349d386..ca81e885025 100644 --- a/misc/fbreader/distinfo +++ b/misc/fbreader/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2015/03/31 15:51:11 joerg Exp $ +$NetBSD: distinfo,v 1.10 2015/04/02 21:23:22 joerg Exp $ SHA1 (fbreader-sources-0.99.4.tgz) = 7e6f0acbac5d8111fcda14a576ae4fdc93eef292 RMD160 (fbreader-sources-0.99.4.tgz) = 90825fcb6b026785dd3a7329899b54a02b08e4ed @@ -12,7 +12,7 @@ SHA1 (patch-fbreader_src_fbreader_FBView.cpp) = f9018b813b92d31c67e13eb68d6e50c8 SHA1 (patch-fbreader_src_formats_html_HtmlReader.cpp) = fe0ebe4dff97a11581a6d7b079f8f19f4e3be019 SHA1 (patch-makefiles_qsubdir.mk) = a139410def61e793b193cb54716b9ffb339b5692 SHA1 (patch-makefiles_subdir.mk) = b9c7d0339e86b9cd6010d4156f35233320a14436 -SHA1 (patch-zlibrary_core_Makefile) = f9141aadbfa7844ac553643957b48ff221e1768f -SHA1 (patch-zlibrary_text_Makefile) = 0380a2242fc453c1bef462701dd0abc653d87a52 +SHA1 (patch-zlibrary_core_Makefile) = 141543c94a63f9c56858c43f07892e05b060bf01 +SHA1 (patch-zlibrary_text_Makefile) = aa7d8a7e3d170e903af704edafe49297e158fd51 SHA1 (patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp) = ec87bd8072c2385df6e224c7cb1a914bef595f78 -SHA1 (patch-zlibrary_ui_Makefile) = ac23e1618abfa17bf208f95283781a1d3840cb8d +SHA1 (patch-zlibrary_ui_Makefile) = 9586070b53f415ec757fb6648c66c36684e801ea diff --git a/misc/fbreader/patches/patch-zlibrary_core_Makefile b/misc/fbreader/patches/patch-zlibrary_core_Makefile index 0d5fd1fdd7d..0b163e767da 100644 --- a/misc/fbreader/patches/patch-zlibrary_core_Makefile +++ b/misc/fbreader/patches/patch-zlibrary_core_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-zlibrary_core_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $ +$NetBSD: patch-zlibrary_core_Makefile,v 1.2 2015/04/02 21:23:22 joerg Exp $ * Libtoolized. @@ -13,16 +13,19 @@ $NetBSD: patch-zlibrary_core_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $ TARGET_SONAME = libzlcore.so.$(SOVERSION) TARGET_SHORTNAME = libzlcore.so endif -@@ -50,7 +50,7 @@ $(TARGET): .objects +@@ -50,10 +50,8 @@ $(TARGET): .objects @echo -n 'Creating $@ ...' @$(RM_QUIET) $(TARGET) ifeq "$(ZLSHARED)" "yes" - @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) + @${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.lo, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) -rpath ${PREFIX}/lib #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(ZLUI_LIB) -ldl -liconv - @ln -sf $(TARGET) $(TARGET_SONAME) - @ln -sf $(TARGET) $(TARGET_SHORTNAME) -@@ -83,9 +83,7 @@ do_install: +- @ln -sf $(TARGET) $(TARGET_SONAME) +- @ln -sf $(TARGET) $(TARGET_SHORTNAME) + else + @$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) + endif +@@ -83,9 +81,7 @@ do_install: fi ifeq "$(ZLSHARED)" "yes" @install -d $(DESTDIR)$(LIBDIR) diff --git a/misc/fbreader/patches/patch-zlibrary_text_Makefile b/misc/fbreader/patches/patch-zlibrary_text_Makefile index 8a862737450..60be926ff05 100644 --- a/misc/fbreader/patches/patch-zlibrary_text_Makefile +++ b/misc/fbreader/patches/patch-zlibrary_text_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-zlibrary_text_Makefile,v 1.2 2013/06/27 14:21:09 ryoon Exp $ +$NetBSD: patch-zlibrary_text_Makefile,v 1.3 2015/04/02 21:23:22 joerg Exp $ * Use liblinebreak instead of libunibreak * Libtoolized. @@ -14,16 +14,19 @@ $NetBSD: patch-zlibrary_text_Makefile,v 1.2 2013/06/27 14:21:09 ryoon Exp $ TARGET_SONAME = libzltext.so.$(SOVERSION) TARGET_SHORTNAME = libzltext.so endif -@@ -34,7 +34,7 @@ $(TARGET): .objects +@@ -34,10 +34,8 @@ $(TARGET): .objects @echo -n 'Creating $@ ...' @$(RM_QUIET) $(TARGET) ifeq "$(ZLSHARED)" "yes" - @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -lunibreak -lfribidi + @${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.lo, $(SUBDIRS)) $(CORE_LIBS) -llinebreak -lfribidi -rpath ${PREFIX}/lib #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) $(EXTERNAL_LIBS) -llinebreak -lfribidi - @ln -sf $(TARGET) $(TARGET_SONAME) - @ln -sf $(TARGET) $(TARGET_SHORTNAME) -@@ -50,9 +50,7 @@ do_install: +- @ln -sf $(TARGET) $(TARGET_SONAME) +- @ln -sf $(TARGET) $(TARGET_SHORTNAME) + else + @$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) + endif +@@ -50,9 +48,7 @@ do_install: @install -m 0644 $(wildcard data/hyphenationPatterns.zip) $(SHARE_ZLIBRARY) ifeq "$(ZLSHARED)" "yes" @install -d $(DESTDIR)$(LIBDIR) diff --git a/misc/fbreader/patches/patch-zlibrary_ui_Makefile b/misc/fbreader/patches/patch-zlibrary_ui_Makefile index f9cb5659b86..bddd17cedaf 100644 --- a/misc/fbreader/patches/patch-zlibrary_ui_Makefile +++ b/misc/fbreader/patches/patch-zlibrary_ui_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-zlibrary_ui_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $ +$NetBSD: patch-zlibrary_ui_Makefile,v 1.2 2015/04/02 21:23:22 joerg Exp $ * Libtoolized. @@ -13,16 +13,19 @@ $NetBSD: patch-zlibrary_ui_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $ TARGET_SONAME = libzlui.so.$(SOVERSION) TARGET_SHORTNAME = libzlui.so endif -@@ -117,7 +117,7 @@ $(TARGET): .objects +@@ -117,10 +117,8 @@ $(TARGET): .objects @echo -n 'Creating $@ ...' @$(RM_QUIET) $(TARGET) ifeq "$(ZLSHARED)" "yes" - @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS) + @${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.lo, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS) -rpath ${PREFIX}/lib #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS) - @ln -sf $(TARGET) $(TARGET_SONAME) - @ln -sf $(TARGET) $(TARGET_SHORTNAME) -@@ -143,9 +143,7 @@ do_install: +- @ln -sf $(TARGET) $(TARGET_SONAME) +- @ln -sf $(TARGET) $(TARGET_SHORTNAME) + else + @$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) + endif +@@ -143,9 +141,7 @@ do_install: @install -m 0644 data/style.$(TARGET_ARCH).qss $(SHARE_ZLIBRARY)/style.qss ifeq "$(ZLSHARED)" "yes" @install -d $(DESTDIR)$(LIBDIR) |