diff options
| author | dbj <dbj@pkgsrc.org> | 2020-11-29 22:08:56 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2020-11-29 22:08:56 +0000 |
| commit | 8b40cbbd8544b36b2a0747a4228314b1cb2f8b96 (patch) | |
| tree | 66515941a488706263f6f3b8cac784424a693788 /x11 | |
| parent | d32033729f3e12adc5a6af066497a531697bc7f7 (diff) | |
| download | pkgsrc-8b40cbbd8544b36b2a0747a4228314b1cb2f8b96.tar.gz | |
x11/wxGTK30: don't call install_name_tool on symlinks
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/wxGTK30/Makefile | 4 | ||||
| -rw-r--r-- | x11/wxGTK30/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK30/patches/patch-configure | 33 |
3 files changed, 34 insertions, 7 deletions
diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 8325bba0922..4326ec76b4c 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2020/08/17 20:18:02 leot Exp $ +# $NetBSD: Makefile,v 1.41 2020/11/29 22:08:56 dbj Exp $ DISTNAME= wxWidgets-3.0.5.1 PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK30/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/} GITHUB_PROJECT= wxWidgets diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo index 5839de86779..4a6e2489b4f 100644 --- a/x11/wxGTK30/distinfo +++ b/x11/wxGTK30/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.21 2020/07/18 13:02:53 adam Exp $ +$NetBSD: distinfo,v 1.22 2020/11/29 22:08:56 dbj Exp $ SHA1 (wxWidgets-3.0.5.1.tar.bz2) = 406ac736f61d88a3a866aa501e01e408a642c6e7 RMD160 (wxWidgets-3.0.5.1.tar.bz2) = 931ddabfbc54e20ced14c81c74e451be8073dee5 SHA512 (wxWidgets-3.0.5.1.tar.bz2) = 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d Size (wxWidgets-3.0.5.1.tar.bz2) = 19739206 bytes -SHA1 (patch-configure) = 8e5a8c489cf4fcd2b638c45ca084febce398722f +SHA1 (patch-configure) = da4e1f00cb2786a5f3190a090e5eed279e204e82 SHA1 (patch-misc_scripts_makeosxtags.sh) = a18e1c44f1cbc0e81cb75ae9df1eedd3643446c4 SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = fe34102b241f84f8add08ed69d8c9c1c9c2df771 diff --git a/x11/wxGTK30/patches/patch-configure b/x11/wxGTK30/patches/patch-configure index 738a8d3a5a5..c9930f6074c 100644 --- a/x11/wxGTK30/patches/patch-configure +++ b/x11/wxGTK30/patches/patch-configure @@ -1,11 +1,29 @@ -$NetBSD: patch-configure,v 1.7 2020/07/18 13:02:54 adam Exp $ +$NetBSD: patch-configure,v 1.8 2020/11/29 22:08:56 dbj Exp $ +Remove install program overrides on Darwin Tweak SEARCH_LIB. +Don't call install_name_tool on symlinks Avoid -Werror. --- configure.orig 2020-05-02 14:03:18.000000000 +0000 +++ configure -@@ -21778,7 +21778,7 @@ fi +@@ -19327,15 +19327,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi + + fi +-case "${host}" in +- +- *-*-darwin* ) +- INSTALL_PROGRAM="cp -fp" +- INSTALL_DATA="cp -fp" +- ;; +- *) +- ;; +-esac + + + if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then +@@ -21778,7 +21769,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5 $as_echo "$wx_cv_std_libfullpath" >&6; } @@ -14,7 +32,16 @@ Avoid -Werror. if test "$build" != "$host" -a "$GCC" = yes; then if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then -@@ -35158,9 +35158,6 @@ if ac_fn_cxx_try_compile "$LINENO"; then +@@ -28844,7 +28835,7 @@ for dep in \${libnames} ; do + changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}" + done + for i in \${libnames} ; do +- ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} ++ [ -h \${1}/\${i} ] || ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} + done + EOF + chmod +x change-install-names +@@ -35158,9 +35149,6 @@ if ac_fn_cxx_try_compile "$LINENO"; then else CFLAGS_OLD="$CFLAGS" |