pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/wxGTK30/patches wxGTK30: remove remnants of build ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d9c4dd94fde0
branches: trunk
changeset: 311666:d9c4dd94fde0
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Aug 16 11:28:06 2018 +0000
description:
wxGTK30: remove remnants of build system changes
The other patches for this have been removed from the package,
we use the upstream build system now.
diffstat:
x11/wxGTK30/patches/manual-bakefile.diff | 238 -------------------------------
x11/wxGTK30/patches/manual-regen.diff | 122 ---------------
2 files changed, 0 insertions(+), 360 deletions(-)
diffs (truncated from 368 to 300 lines):
diff -r dcb2450852a9 -r d9c4dd94fde0 x11/wxGTK30/patches/manual-bakefile.diff
--- a/x11/wxGTK30/patches/manual-bakefile.diff Thu Aug 16 11:26:05 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-diff -ru rules.orig/autoconf.bkl rules/autoconf.bkl
---- rules.orig/autoconf.bkl 2011-02-02 14:04:25.000000000 -0800
-+++ rules/autoconf.bkl 2016-02-13 16:51:17.000000000 -0800
-@@ -200,82 +200,19 @@
-
- <set var="__linkname1">$(__linkname)</set>
-
-- <set var="__targetsuf2">
-- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0'">
-- $(DLLEXT).$(__soversion1)
-- </if>
-- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
-- .$(__soversion1)$(DLLEXT)
-- </if>
-- <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
-- </set>
-+ <set var="__targetsuf2">$(DLLEXT)</set>
- <set var="__linkname2" eval="0">
- $(DLLPREFIX)$(__dllname)$(__targetsuf2)
- </set>
-
-- <set var="__targetsuf3">
-- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0' and USE_SOVERCYGWIN=='0'">
-- $(DLLEXT).$(__soversion1).$(__soversion2).$(__soversion3)
-- </if>
-- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
-- .$(__soversion1).$(__soversion2).$(__soversion3)$(DLLEXT)
-- </if>
-- <if cond="USE_SOVERSION=='1' and USE_SOVERSOLARIS=='1'">
-- $(DLLEXT).$(__soversion1)
-- </if>
-- <if cond="USE_SOVERSION=='1' and USE_SOVERCYGWIN=='1'">
-- -$(__soversion1)$(DLLEXT)
-- </if>
-- <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
-- </set>
-+ <set var="__targetsuf3">$(DLLEXT)</set>
- <set var="__targetname" eval="0">
- $(DLLPREFIX)$(__dllname)$(__targetsuf3)
- </set>
-
-- <set var="__soname_flags">
-- <if cond="USE_SOVERLINUX=='1'"> <!-- Linux -->
-- $(SONAME_FLAG)$(__linkname2)
-- </if>
-- <if cond="USE_SOVERSOLARIS=='1'"> <!-- Solaris -->
-- $(SONAME_FLAG)$(__targetname)
-- </if>
-- </set>
-+ <set var="__soname_flags">-version-number $(__soversion1):$(__soversion2):$(__soversion3)</set>
- <ldflags>$(__soname_flags)</ldflags>
-
-- <set var="__so_symlinks_cmd">
-- <if cond="USE_SOTWOSYMLINKS=='1'">
-- (cd $(pathPrefixToPath(__targetdir));
-- $(RM) $(__linkname1) $(__linkname2);
-- $(LN_S) $(__targetname) $(__linkname2);
-- $(LN_S) $(__linkname2) $(__linkname1))
-- </if>
-- <if cond="USE_SOVERSOLARIS=='1'">
-- (cd $(pathPrefixToPath(__targetdir));
-- $(RM) $(__linkname1);
-- $(LN_S) $(__targetname) $(__linkname1))
-- </if>
-- </set>
-- <set var="__so_symlinks_inst_cmd">
-- <if cond="USE_SOTWOSYMLINKS=='1'">
-- $(RM) $(__linkname1) $(__linkname2);
-- $(LN_S) $(__targetname) $(__linkname2);
-- $(LN_S) $(__linkname2) $(__linkname1)
-- </if>
-- <if cond="USE_SOVERSOLARIS=='1'">
-- $(RM) $(__linkname1);
-- $(LN_S) $(__targetname) $(__linkname1);
-- </if>
-- </set>
-- <set var="__so_symlinks_uninst_cmd">
-- <if cond="USE_SOTWOSYMLINKS=='1'">
-- $(RM) $(__linkname2) $(__linkname1)
-- </if>
-- <if cond="USE_SOVERSOLARIS=='1'">
-- $(RM) $(__linkname1)
-- </if>
-- </set>
-- <__command>$(LF)$(__so_symlinks_cmd)</__command>
--
- <set var="__mac_instname">$(__linkname2)</set>
-
- <clean-files>
-@@ -298,12 +235,6 @@
- <set var="__macinstname" eval="0">
- $(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id)))
- </set>
-- <set var="__macinstnamecmd">
-- <if cond="PLATFORM_MACOSX=='1'">
-- -install_name $(value)/$(__macinstname)
-- </if>
-- </set>
-- <ldflags>$(__macinstnamecmd)</ldflags>
-
- <modify-target target="install_$(id)">
- <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command>
-diff -ru rules.orig/makefile.bkl rules/makefile.bkl
---- rules.orig/makefile.bkl 2011-02-02 14:04:25.000000000 -0800
-+++ rules/makefile.bkl 2016-02-13 16:51:17.000000000 -0800
-@@ -749,7 +749,7 @@
- <define-tag name="install-to" rules="exe">
- <modify-target target="install_$(id)">
- <command>
-- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
-+ ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
- </command>
- </modify-target>
- <modify-target target="uninstall_$(id)">
-@@ -762,8 +762,7 @@
- <define-tag name="install-to" rules="dll">
- <modify-target target="install_$(id)">
- <command>
-- $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__linkname',id)) $(DESTDIR)$(nativePaths(value))
-- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
- </command>
- </modify-target>
- <modify-target target="uninstall_$(id)">
-@@ -777,7 +776,7 @@
- <define-tag name="install-to" rules="module">
- <modify-target target="install_$(id)">
- <command>
-- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
- </command>
- </modify-target>
- <modify-target target="uninstall_$(id)">
-diff -ru rules.orig/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl
---- rules.orig/makefile_defs_gnu.bkl 2011-02-02 14:04:25.000000000 -0800
-+++ rules/makefile_defs_gnu.bkl 2016-02-13 16:51:17.000000000 -0800
-@@ -62,12 +62,12 @@
-
- <template id="__commands_templ_C">
- <set var="__COMPILE_C_CMD" eval="0">
-- $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $<
-+ ${LIBTOOL} --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $<
- </set>
- </template>
- <template id="__commands_templ_CXX">
- <set var="__COMPILE_CXX_CMD" eval="0">
-- $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $<
-+ ${LIBTOOL} --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $<
- </set>
- </template>
-
-diff -ru rules.orig/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl
---- rules.orig/makefile_defs_unix.bkl 2011-02-02 14:04:25.000000000 -0800
-+++ rules/makefile_defs_unix.bkl 2016-02-13 18:27:40.000000000 -0800
-@@ -39,22 +39,23 @@
-
- <set var="DIRSEP">/</set>
-
-- <set var="OBJEXT">.o</set>
-+ <set var="LIBTOOL">${LIBTOOL}</set>
-+ <set var="OBJEXT">.lo</set>
- <set var="LIBEXT" overwrite="0">.a</set>
- <set var="LIBPREFIX" overwrite="0">lib</set>
- <set var="EXEEXT" overwrite="0"></set>
-- <set var="DLLEXT" overwrite="0">.so</set>
-+ <set var="DLLEXT" overwrite="1">.la</set>
- <set var="DLLEXT_MODULE" overwrite="0">$(DLLEXT)</set>
- <set var="DLLIMPEXT" overwrite="0">$(DLLEXT)</set>
- <set var="DLLPREFIX" overwrite="0">$(LIBPREFIX)</set>
- <set var="DLLPREFIX_MODULE" overwrite="0">$(DLLPREFIX)</set>
-- <set var="PIC_CFLAGS" overwrite="0">-fPIC -DPIC</set>
-+ <set var="PIC_CFLAGS" overwrite="0"></set>
-
- <set var="RM">rm -f</set>
-
-- <set var="INSTALL_PROGRAM" overwrite="0">install -c</set>
-- <set var="INSTALL_DATA" overwrite="0">$(INSTALL) -m 644</set>
-- <set var="INSTALL_DIR" overwrite="0">$(INSTALL) -d</set>
-+ <set var="INSTALL_PROGRAM" overwrite="1">${BSD_INSTALL_PROGRAM}</set>
-+ <set var="INSTALL_DATA" overwrite="1">${BSD_INSTALL_DATA}</set>
-+ <set var="INSTALL_DIR" overwrite="1">${BSD_INSTALL_DATA_DIR}</set>
-
- <set var="UNINSTALL_PROGRAM" overwrite="0">$(RM)</set>
- <set var="UNINSTALL_DATA" overwrite="0">$(RM)</set>
-@@ -122,24 +123,24 @@
- <if cond="FORMAT not in ['gnu','suncc']">
- <template id="__commands_templ_C">
- <set var="__COMPILE_C_CMD" eval="0">
-- $(CCC) -c -o $@ $(__cflags) $(src)
-+ $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(src)
- </set>
- </template>
- <template id="__commands_templ_CXX">
- <set var="__COMPILE_CXX_CMD" eval="0">
-- $(CXXC) -c -o $@ $(__cxxflags) $(src)
-+ $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(src)
- </set>
- </template>
- <!-- FIXME: We should allow for a different Objective-C compiler -->
- <template id="__commands_templ_OBJC">
- <set var="__COMPILE_OBJC_CMD" eval="0">
-- $(CCC) -c -o $@ $(__objcflags) $(src)
-+ $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@ $(__objcflags) $(src)
- </set>
- </template>
- <!-- FIXME: We should allow for a different Objective-C++ compiler -->
- <template id="__commands_templ_OBJCXX">
- <set var="__COMPILE_OBJCXX_CMD" eval="0">
-- $(CXXC) -c -o $@ $(__objcxxflags) $(src)
-+ $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__objcxxflags) $(src)
- </set>
- </template>
- </if>
-@@ -154,18 +155,16 @@
- </set>
-
- <set var="__LINK_EXE_CMD" eval="0">
-- $(__linker) -o $@ $(__objects_var) $(__ldargs)
-+ $(LIBTOOL) --mode=link --tag=CC $(__linker) -o $@ $(__objects_var) $(__ldargs)
- </set>
- <set var="__LINK_LIB_CMD" eval="0">
-- $(RM) $@
-- $(AR) $(AROPTIONS) $@ $(__objects_var)
-- $(RANLIB) $@
-+ $(LIBTOOL) --mode=link --tag=CC $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
- </set>
- <set var="__LINK_DLL_CMD" eval="0">
-- $(__dll_linker) $@ $(__objects_var) $(__ldargs)
-+ $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -shared -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
- </set>
- <set var="__LINK_MODULE_CMD" eval="0">
-- $(__module_linker) $@ $(__objects_var) $(__ldargs)
-+ $(LIBTOOL)--mode=link --tag=CC $(__linker) -rpath $(libdir) -module -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
- </set>
- </template>
-
-Only in rules: makefile_defs_unix.bkl.~1~
-Only in rules: makefile_defs_unix.bkl.~2~
diff -r dcb2450852a9 -r d9c4dd94fde0 x11/wxGTK30/patches/manual-regen.diff
--- a/x11/wxGTK30/patches/manual-regen.diff Thu Aug 16 11:26:05 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-diff -ru wxWidgets-3.0.2.old/build/bakefiles/common.bkl wxWidgets-3.0.2/build/bakefiles/common.bkl
---- wxWidgets-3.0.2.old/build/bakefiles/common.bkl 2016-03-24 13:27:07.034451400 +0000
-+++ wxWidgets-3.0.2/build/bakefiles/common.bkl 2016-03-24 13:27:18.295690311 +0000
-@@ -708,7 +708,6 @@
- <if cond="FORMAT=='autoconf'">
- <res-include>$(RCDEFDIR)</res-include>
- <res-include>$(TOP_SRCDIR)include</res-include>
-- <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
- </if>
- <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
-
-diff -ru wxWidgets-3.0.2.old/build/bakefiles/config.bkl wxWidgets-3.0.2/build/bakefiles/config.bkl
---- wxWidgets-3.0.2.old/build/bakefiles/config.bkl 2016-03-24 13:27:07.034623707 +0000
-+++ wxWidgets-3.0.2/build/bakefiles/config.bkl 2016-03-24 13:27:18.296182090 +0000
-@@ -425,8 +425,6 @@
- <option name="EXTRALIBS_SDL"/>
- <option name="CXXWARNINGS"/>
- <option name="HOST_SUFFIX"/>
-- <option name="DYLIB_RPATH_INSTALL"/>
-- <option name="DYLIB_RPATH_POSTLINK"/>
- <option name="SAMPLES_RPATH_FLAG"/>
-
- <!-- see configure.in; it's required by some samples on Mac OS X -->
-diff -ru wxWidgets-3.0.2.old/build/bakefiles/regex.bkl wxWidgets-3.0.2/build/bakefiles/regex.bkl
---- wxWidgets-3.0.2.old/build/bakefiles/regex.bkl 2016-03-24 13:27:07.035148244 +0000
-+++ wxWidgets-3.0.2/build/bakefiles/regex.bkl 2016-03-24 13:27:18.296378774 +0000
-@@ -26,16 +26,13 @@
- <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
- </set>
-
-- <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
-+ <dll id="wxregex" template="msvc_setup_h,anylib"
- cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
-- <libname cond="FORMAT=='autoconf'">
-- $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-- </libname>
-- <libname cond="FORMAT!='autoconf'">
-- $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
-- </libname>
-- <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
-- <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
-+ <dllname>
-+ $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)
-+ </dllname>
-+ <version>$(WX_VERSION)</version>
-+ <so_version>$(WXSOVERSION)</so_version>
- <define>__WX$(TOOLKIT)__</define>
- <define>$(WXUNIV_DEFINE)</define>
- <define>$(UNICODE_DEFINE)</define>
-@@ -48,6 +45,6 @@
- src/regex/regerror.c
- src/regex/regfree.c
- </sources>
-- </lib>
Home |
Main Index |
Thread Index |
Old Index