Skip to content

Commit

Permalink
Use -Wl,--no-undefined instead of -Wl,-no-undefined in abiword*.
Browse files Browse the repository at this point in the history
Remove the many of the patches and use BUILDLINK_TRANSFORM instead.
Reported by Richard Palo in private mail.
  • Loading branch information
nros committed Jan 24, 2016
1 parent 4afc1fb commit ee349af
Show file tree
Hide file tree
Showing 54 changed files with 19 additions and 736 deletions.
4 changes: 3 additions & 1 deletion editors/abiword-plugins/Makefile
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.62 2015/10/10 01:58:07 ryoon Exp $
# $NetBSD: Makefile,v 1.63 2016/01/24 15:30:47 nros Exp $

.include "../../editors/abiword/Makefile.common"
DISTNAME= abiword-${ABIVERSION}
Expand Down Expand Up @@ -94,6 +94,8 @@ pre-configure:
cd ${WRKSRC}; \
autoreconf --force --install

BUILDLINK_TRANSFORM+= opt:-no-undefined:-Wl,--no-undefined

.include "../../editors/abiword/options.mk"

.include "../../archivers/bzip2/buildlink3.mk"
Expand Down
4 changes: 3 additions & 1 deletion editors/abiword/Makefile
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.156 2015/09/21 11:28:45 nros Exp $
# $NetBSD: Makefile,v 1.157 2016/01/24 15:30:46 nros Exp $

.include "Makefile.common"
DISTNAME= abiword-${ABIVERSION}
Expand Down Expand Up @@ -31,6 +31,8 @@ pre-configure:
cd ${WRKSRC}; \
autoreconf --force --install

BUILDLINK_TRANSFORM+= opt:-no-undefined:-Wl,--no-undefined

.include "options.mk"

.include "../../converters/fribidi/buildlink3.mk"
Expand Down
58 changes: 5 additions & 53 deletions editors/abiword/distinfo
@@ -1,73 +1,25 @@
$NetBSD: distinfo,v 1.67 2015/11/03 03:32:14 agc Exp $
$NetBSD: distinfo,v 1.68 2016/01/24 15:30:46 nros Exp $

SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
SHA512 (abiword-3.0.1.tar.gz) = c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf
Size (abiword-3.0.1.tar.gz) = 11144990 bytes
SHA1 (patch-configure.ac) = bbffa133509affe43fdef7e420e3a96a14edf58f
SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40
SHA1 (patch-plugins_aiksaurus_Makefile.am) = e859a0af2b436616b1dae45f3be8593cf917c87d
SHA1 (patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am) = 2790a45fa4590f8f5ac27ec6e1b0e9eacc5c7c6e
SHA1 (patch-plugins_applix_Makefile.am) = d579e6620189bcdd5cb9286edb77936893d66727
SHA1 (patch-plugins_babelfish_Makefile.am) = 9a14d52b882824a344e4189b210ea05f15cd5dc4
SHA1 (patch-plugins_bmp_Makefile.am) = 9919326323259fdb717f1cc1b63be7b5fecb4d85
SHA1 (patch-plugins_clarisworks_Makefile.am) = 20b149e4ccba72e54421e59f62cee8823737af5d
SHA1 (patch-plugins_collab_Makefile.am) = 268b976c687e300326f1af9933cea7c060ecef90
SHA1 (patch-plugins_command_Makefile.am) = 42bf4af0905f83faf21ceabfbf20756c39d9d268
SHA1 (patch-plugins_docbook_Makefile.am) = 73ef7476c0eae93a79ffd1571081b545a7cf5f0b
SHA1 (patch-plugins_eml_Makefile.am) = 23bccc8e3aa62275f441635675a2a34f53c5d118
SHA1 (patch-plugins_epub_Makefile.am) = 0d4f2bca4e2a40d3f0c34f1c5b37284190979d48
SHA1 (patch-plugins_freetranslation_Makefile.am) = f494b16bdd2d8cb484bec09a61c6e3e0d8f78b44
SHA1 (patch-plugins_garble_Makefile.am) = b6c3f68a390c0b4a4e5e5d626a7532f4542b5e9f
SHA1 (patch-plugins_gda_Makefile.am) = 73a112eb3118c6769bef00c5f4c3ad50a735b54a
SHA1 (patch-plugins_gdict_Makefile.am) = 16e6fc9134bf96e8b924c8ef5f6f57988531684b
SHA1 (patch-plugins_gimp_Makefile.am) = 0c284afb8e168dff87da0d4ae70936c8759b8cb5
SHA1 (patch-plugins_aiksaurus_Makefile.am) = df642d973dfa453670807d639da11bb112cbd0bd
SHA1 (patch-plugins_command_Makefile.am) = c26cd671390aa2bfd6f306a62d39fc6d50c56939
SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
SHA1 (patch-plugins_goffice_Makefile.am) = 935af789858b3fbf3b928837acca024a1415bf86
SHA1 (patch-plugins_google_Makefile.am) = ae883071f847b641ded349e5cb2ac3c126942d8d
SHA1 (patch-plugins_grammar_Makefile.am) = 0c651d09ae690a22ce70f93fd091ceabb18a44d0
SHA1 (patch-plugins_goffice_Makefile.am) = 37afe59c96df7b0a3702a6df99abe42249e339d9
SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c
SHA1 (patch-plugins_hancom_Makefile.am) = 93e6b69160438a254a6c68b81a6385456d328999
SHA1 (patch-plugins_hrtext_Makefile.am) = 439ecd0ac09b147c5a789bfb498e5da866d0cb59
SHA1 (patch-plugins_iscii_Makefile.am) = ff740a1d6e308658d18c0102a67fa8c3f32cf95b
SHA1 (patch-plugins_kword_Makefile.am) = bac30878f5eb8a3d7d037f13bdef81308c5a3e17
SHA1 (patch-plugins_latex_Makefile.am) = 196edb99bcbc3040ec665bf422472558684c5fe5
SHA1 (patch-plugins_loadbindings_Makefile.am) = e689adf52c0786f648435e259da3410a98036887
SHA1 (patch-plugins_mathview_Makefile.am) = 8a779c043b3b9b483ec072e2780240e1ec6f575a
SHA1 (patch-plugins_mht_Makefile.am) = a302d8af3cbcaa246b1d61cf90adb2276a95d502
SHA1 (patch-plugins_mif_Makefile.am) = 9dbd23cee5d1f5d56058eb95cf3f247766972110
SHA1 (patch-plugins_mswrite_Makefile.am) = bd0d7546d07500ce74828e0414ee14278c49a396
SHA1 (patch-plugins_opendocument_Makefile.am) = db01004db8480509f9c6060f82b7095bfe0b4715
SHA1 (patch-plugins_openwriter_Makefile.am) = 40fc8135faa71918f02420ba5d527f74bc4e7999
SHA1 (patch-plugins_openxml_Makefile.am) = 1eb9cf1df2fdd9e707e26412089b08f45ae59581
SHA1 (patch-plugins_opml_Makefile.am) = 94fe9afb9d8145f36d50abec8c956cc295a6ff4d
SHA1 (patch-plugins_ots_Makefile.am) = a674a0b2a222ba8d2acc8de002bf6d618c206573
SHA1 (patch-plugins_paint_Makefile.am) = bbae6fdc2cfa162ccd2dd87178759997c6e7b71b
SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
SHA1 (patch-plugins_passepartout_Makefile.am) = c048ef9cdfab149394a6ecb02f7d5faf027c89ed
SHA1 (patch-plugins_pdb_Makefile.am) = a01b5ed0ee10d3f72cf6fa2d20b96628844c8217
SHA1 (patch-plugins_pdf_Makefile.am) = 68fd361019ab4f2a3bd9bc0ea9e5b2d697e13e45
SHA1 (patch-plugins_presentation_Makefile.am) = 463c2bd628d4cdad9cee89ae1c10c56b0343366d
SHA1 (patch-plugins_psion_Makefile.am) = 1f8836ea23aa38ad6716461fa4f0c6db1ec6eba0
SHA1 (patch-plugins_rsvg_Makefile.am) = f844ee15921547e769da8dd5acfb64b57958b33f
SHA1 (patch-plugins_s5_Makefile.am) = 4cf5ee72bd6878c5e3801141023c1e0ec5ec9002
SHA1 (patch-plugins_sdw_Makefile.am) = b9a756c639225e7d57543f83d6db6e93be3d411e
SHA1 (patch-plugins_t602_Makefile.am) = a4714fcefe149b874832683688a7537dcb04ae9f
SHA1 (patch-plugins_urldict_Makefile.am) = 7cfb2775dd67cce045e31a01b79e4cb04887f7d5
SHA1 (patch-plugins_wikipedia_Makefile.am) = 57e65f04b202f475c586d399a8c128f51d594630
SHA1 (patch-plugins_wmf_Makefile.am) = 00bf982683d1d6c122b62a1df1bc241f6e276c4d
SHA1 (patch-plugins_wml_Makefile.am) = 6c05337b5619864dde5a2100e1859684333fed47
SHA1 (patch-plugins_wordperfect_Makefile.am) = d08d7d21ed8106bcbe77cc42ffca13d7ad18d3ac
SHA1 (patch-plugins_psion_Makefile.am) = 0d883b06e7f0368826e0d729c84cf9711555ab54
SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1
SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9
SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e
SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc
SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3
SHA1 (patch-plugins_wpg_Makefile.am) = a96fafec05866fb7c3480c8d2a041b970ad8e988
SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
SHA1 (patch-plugins_xslfo_Makefile.am) = cceef8d780dc63c1253544f21bd123dac19eba0b
SHA1 (patch-src_Makefile.am) = b2b898470b842e5bfa45e2b3b653ca9b51714b73
SHA1 (patch-src_af_util_xp_ut__endian.h) = e73aef0db6ddef0316cca3f7a77fd4c71c870637
SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
Expand Down
4 changes: 2 additions & 2 deletions editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
@@ -1,4 +1,4 @@
$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $
GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
to the linker. Prefix with "-Wl," to fix build.
Use CXX for linking.
Expand All @@ -9,7 +9,7 @@ Use CXX for linking.
-avoid-version \
-module \
- -no-undefined
+ -Wl,-no-undefined
+ -Wl,--no-undefined

aiksaurus_la_SOURCES =
+nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp
Expand Down

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_applix_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_babelfish_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_bmp_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_collab_Makefile.am

This file was deleted.

4 changes: 2 additions & 2 deletions editors/abiword/patches/patch-plugins_command_Makefile.am
@@ -1,4 +1,4 @@
$NetBSD: patch-plugins_command_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
$NetBSD: patch-plugins_command_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $
GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
to the linker. Prefix with "-Wl," to fix build.
Use CXX for linking.
Expand All @@ -9,7 +9,7 @@ Use CXX for linking.
-avoid-version \
-module \
- -no-undefined
+ -Wl,-no-undefined
+ -Wl,--no-undefined

command_la_SOURCES =
+nodist_EXTRA_command_la_SOURCES = dummy.cpp
Expand Down
14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_docbook_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_eml_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_epub_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_freetranslation_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_garble_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_gda_Makefile.am

This file was deleted.

18 changes: 0 additions & 18 deletions editors/abiword/patches/patch-plugins_gdict_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_gimp_Makefile.am

This file was deleted.

4 changes: 2 additions & 2 deletions editors/abiword/patches/patch-plugins_goffice_Makefile.am
@@ -1,4 +1,4 @@
$NetBSD: patch-plugins_goffice_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
$NetBSD: patch-plugins_goffice_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $
GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
to the linker. Prefix with "-Wl," to fix build.
Use CXX for linking.
Expand All @@ -15,7 +15,7 @@ Use CXX for linking.
-avoid-version \
-module \
- -no-undefined
+ -Wl,-no-undefined
+ -Wl,--no-undefined

goffice_la_SOURCES =
+nodist_EXTRA_goffice_la_SOURCES = dummy.cpp
Expand Down
14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_google_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_grammar_Makefile.am

This file was deleted.

14 changes: 0 additions & 14 deletions editors/abiword/patches/patch-plugins_hancom_Makefile.am

This file was deleted.

0 comments on commit ee349af

Please sign in to comment.