From 91e2f55f8724b8bbf357c6ea6ce58d30aab26bcc Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Wed, 11 Mar 2020 13:47:29 +0100 Subject: [PATCH 1/3] revbump to 2.0.1 --- Confix2.pkg | 2 +- cygwin/parity.cygport | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Confix2.pkg b/Confix2.pkg index eb104bb..e8ad503 100755 --- a/Confix2.pkg +++ b/Confix2.pkg @@ -1,7 +1,7 @@ import re PACKAGE_NAME('parity') -PACKAGE_VERSION('2.0.0') +PACKAGE_VERSION('2.0.1') from libconfix.setups.boilerplate import AutoBoilerplate from libconfix.setups.c import AutoC diff --git a/cygwin/parity.cygport b/cygwin/parity.cygport index d3ef8b1..8154353 100644 --- a/cygwin/parity.cygport +++ b/cygwin/parity.cygport @@ -1,5 +1,5 @@ NAME="parity" -VERSION="2.0.0" +VERSION="2.0.1" RELEASE="0.1" CATEGORY="Devel" From 60311453851bf16c57c5ebd0912e91620fdc002f Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Wed, 11 Mar 2020 13:33:22 +0100 Subject: [PATCH 2/3] update libtool patch no. 0006, rebase subsequent ones --- ...-find-NAME.lib-with-lNAME-eventually.patch | 22 ++++++++++------- ...-import-sym-may-be-beyond-100th-line.patch | 4 ++-- ...-with-Parity-2-a-wrapper-around-MSVC.patch | 24 +++++++++---------- ...-find-NAME.lib-with-lNAME-eventually.patch | 22 ++++++++++------- ...-import-sym-may-be-beyond-100th-line.patch | 4 ++-- ...-with-Parity-2-a-wrapper-around-MSVC.patch | 24 +++++++++---------- 6 files changed, 56 insertions(+), 44 deletions(-) diff --git a/parity.patches/libtool-2.4.6-44-gb9b44533/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch b/parity.patches/libtool-2.4.6-44-gb9b44533/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch index c5c2ef3..4cc5e8e 100644 --- a/parity.patches/libtool-2.4.6-44-gb9b44533/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch +++ b/parity.patches/libtool-2.4.6-44-gb9b44533/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch @@ -1,4 +1,4 @@ -From 4fbed43077bb248cda7af30440a21198d1f87815 Mon Sep 17 00:00:00 2001 +From 3ebf9e0cbfec9af0b111f8f26de09fc2990a1556 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Tue, 26 Nov 2019 15:05:45 +0100 Subject: [PATCH 6/8] libtool: find NAME.lib with -lNAME eventually @@ -12,25 +12,31 @@ the .la file, we won't find any library with -lNAME. addition to the traditional file names when searching for library files upon the -lNAME linker option. --- - build-aux/ltmain.in | 30 ++++++++++++++++++++++++------ - 1 file changed, 24 insertions(+), 6 deletions(-) + build-aux/ltmain.in | 36 ++++++++++++++++++++++++++++++------ + 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 73c51d06..19257a55 100644 +index 73c51d06..155d566f 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in -@@ -5787,17 +5787,26 @@ func_mode_link () +@@ -5787,17 +5787,32 @@ func_mode_link () fi func_stripname '-l' '' "$deplib" name=$func_stripname_result ++ release_save=$release ++ major_save=$major ++ versuffix_save=$versuffix ++ module_save=$module + release= + major= + versuffix= -+ module_save=$module + module=no + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + eval search_names=\"lib$name.la $library_names_spec lib$name$shared_ext lib$name.so $libname.$libext lib$name.$libext lib$name.a\" ++ release=$release_save ++ major=$major_save ++ versuffix=$versuffix_save + module=$module_save if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" @@ -49,7 +55,7 @@ index 73c51d06..19257a55 100644 found=: else found=false -@@ -7486,7 +7495,12 @@ EOF +@@ -7486,7 +7501,12 @@ EOF esac fi if test -n "$a_deplib"; then @@ -63,7 +69,7 @@ index 73c51d06..19257a55 100644 if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else -@@ -7494,12 +7508,16 @@ EOF +@@ -7494,12 +7514,16 @@ EOF fi test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do diff --git a/parity.patches/libtool-2.4.6-44-gb9b44533/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch b/parity.patches/libtool-2.4.6-44-gb9b44533/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch index 3b641a6..3b55c55 100644 --- a/parity.patches/libtool-2.4.6-44-gb9b44533/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch +++ b/parity.patches/libtool-2.4.6-44-gb9b44533/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch @@ -1,4 +1,4 @@ -From 5f1a9bd2ed0e0f3a9809c5297627221182e86748 Mon Sep 17 00:00:00 2001 +From de54388d070b6f99ffa66bc2ee06113f05f3c896 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Wed, 4 Dec 2019 14:33:51 +0100 Subject: [PATCH 7/8] libtool: first import sym may be beyond 100th line @@ -15,7 +15,7 @@ using some POSIX nm to query for the first import symbol listed. 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 19257a55..a0b35dd9 100644 +index 155d566f..9674ba13 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in @@ -3049,12 +3049,10 @@ func_win32_libid () diff --git a/parity.patches/libtool-2.4.6-44-gb9b44533/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch b/parity.patches/libtool-2.4.6-44-gb9b44533/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch index 43020af..95d523b 100644 --- a/parity.patches/libtool-2.4.6-44-gb9b44533/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch +++ b/parity.patches/libtool-2.4.6-44-gb9b44533/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch @@ -1,4 +1,4 @@ -From 20353cc5acb1d6d110f914d314a95ac7ba931321 Mon Sep 17 00:00:00 2001 +From eb5f70d59a5e17f70de4acb572e89e5954a2d3de Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Tue, 2 May 2017 14:00:33 +0200 Subject: [PATCH 8/8] support winnt with Parity-2, a wrapper around MSVC @@ -18,7 +18,7 @@ create the import library NAME.lib. 7 files changed, 169 insertions(+), 44 deletions(-) diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index a0b35dd9..ebd709cd 100644 +index 9674ba13..ab0a5ede 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in @@ -521,7 +521,7 @@ libtool_validate_options () @@ -174,7 +174,7 @@ index a0b35dd9..ebd709cd 100644 # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. func_warning "'-no-install' is ignored for $host" -@@ -6199,7 +6199,7 @@ func_mode_link () +@@ -6205,7 +6205,7 @@ func_mode_link () fi case $host in # special handling for platforms with PE-DLLs. @@ -183,7 +183,7 @@ index a0b35dd9..ebd709cd 100644 # Linker will automatically link against shared library if both # static and shared are present. Therefore, ensure we extract # symbols from the import library if a shared library is present -@@ -6343,7 +6343,7 @@ func_mode_link () +@@ -6349,7 +6349,7 @@ func_mode_link () if test -n "$library_names" && { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in @@ -192,7 +192,7 @@ index a0b35dd9..ebd709cd 100644 # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no -@@ -6413,7 +6413,7 @@ func_mode_link () +@@ -6419,7 +6419,7 @@ func_mode_link () elif test -n "$soname_spec"; then # bleh windows case $host in @@ -201,7 +201,7 @@ index a0b35dd9..ebd709cd 100644 func_arith $current - $age major=$func_arith_result versuffix=-$major -@@ -7323,7 +7323,7 @@ func_mode_link () +@@ -7329,7 +7329,7 @@ func_mode_link () if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in @@ -210,7 +210,7 @@ index a0b35dd9..ebd709cd 100644 # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) -@@ -7846,7 +7846,7 @@ EOF +@@ -7852,7 +7852,7 @@ EOF orig_export_symbols= case $host_os in @@ -219,7 +219,7 @@ index a0b35dd9..ebd709cd 100644 if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile func_dll_def_p "$export_symbols" || { -@@ -8516,7 +8516,7 @@ EOF +@@ -8522,7 +8522,7 @@ EOF esac fi case $host in @@ -228,7 +228,7 @@ index a0b35dd9..ebd709cd 100644 testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; -@@ -8594,7 +8594,7 @@ EOF +@@ -8600,7 +8600,7 @@ EOF # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. wrappers_required=false ;; @@ -237,7 +237,7 @@ index a0b35dd9..ebd709cd 100644 test yes = "$build_libtool_libs" || wrappers_required=false ;; *) -@@ -8748,7 +8748,7 @@ EOF +@@ -8754,7 +8754,7 @@ EOF *) exeext= ;; esac case $host in @@ -246,7 +246,7 @@ index a0b35dd9..ebd709cd 100644 func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result -@@ -8775,7 +8775,8 @@ EOF +@@ -8781,7 +8781,8 @@ EOF $opt_dry_run || { # note: this script will not be executed, so do not chmod. if test "x$build" = "x$host"; then @@ -256,7 +256,7 @@ index a0b35dd9..ebd709cd 100644 else func_emit_wrapper no > $func_ltwrapper_scriptname_result fi -@@ -9082,7 +9083,7 @@ EOF +@@ -9088,7 +9089,7 @@ EOF # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in diff --git a/parity.patches/libtool-2.4.6/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch b/parity.patches/libtool-2.4.6/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch index e8288eb..44a3109 100644 --- a/parity.patches/libtool-2.4.6/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch +++ b/parity.patches/libtool-2.4.6/0006-libtool-find-NAME.lib-with-lNAME-eventually.patch @@ -1,4 +1,4 @@ -From 4155745e11010326aa4a211cbc45f8e5d2206367 Mon Sep 17 00:00:00 2001 +From e39c287916df15bfaeba6d4b3788b8bae0612243 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Tue, 26 Nov 2019 15:05:45 +0100 Subject: [PATCH 6/8] libtool: find NAME.lib with -lNAME eventually @@ -12,25 +12,31 @@ the .la file, we won't find any library with -lNAME. addition to the traditional file names when searching for library files upon the -lNAME linker option. --- - build-aux/ltmain.in | 30 ++++++++++++++++++++++++------ - 1 file changed, 24 insertions(+), 6 deletions(-) + build-aux/ltmain.in | 36 ++++++++++++++++++++++++++++++------ + 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index ac3a0411..6f4fdaef 100644 +index ac3a0411..7fcffbd2 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in -@@ -5767,17 +5767,26 @@ func_mode_link () +@@ -5767,17 +5767,32 @@ func_mode_link () fi func_stripname '-l' '' "$deplib" name=$func_stripname_result ++ release_save=$release ++ major_save=$major ++ versuffix_save=$versuffix ++ module_save=$module + release= + major= + versuffix= -+ module_save=$module + module=no + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + eval search_names=\"lib$name.la $library_names_spec lib$name$shared_ext lib$name.so $libname.$libext lib$name.$libext lib$name.a\" ++ release=$release_save ++ major=$major_save ++ versuffix=$versuffix_save + module=$module_save if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" @@ -49,7 +55,7 @@ index ac3a0411..6f4fdaef 100644 found=: else found=false -@@ -7466,7 +7475,12 @@ EOF +@@ -7466,7 +7481,12 @@ EOF esac fi if test -n "$a_deplib"; then @@ -63,7 +69,7 @@ index ac3a0411..6f4fdaef 100644 if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else -@@ -7474,12 +7488,16 @@ EOF +@@ -7474,12 +7494,16 @@ EOF fi test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do diff --git a/parity.patches/libtool-2.4.6/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch b/parity.patches/libtool-2.4.6/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch index 437cbf7..886c490 100644 --- a/parity.patches/libtool-2.4.6/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch +++ b/parity.patches/libtool-2.4.6/0007-libtool-first-import-sym-may-be-beyond-100th-line.patch @@ -1,4 +1,4 @@ -From bd6d014bc91b527b3b1a8db02f2758702d7b8e6e Mon Sep 17 00:00:00 2001 +From f16169e45f96f9f74df07f9671a4e4f92b4b5aa4 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Wed, 4 Dec 2019 14:33:51 +0100 Subject: [PATCH 7/8] libtool: first import sym may be beyond 100th line @@ -15,7 +15,7 @@ using some POSIX nm to query for the first import symbol listed. 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 6f4fdaef..e02d5ea9 100644 +index 7fcffbd2..8e172644 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in @@ -3034,12 +3034,10 @@ func_win32_libid () diff --git a/parity.patches/libtool-2.4.6/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch b/parity.patches/libtool-2.4.6/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch index 157a5e9..b4e6c34 100644 --- a/parity.patches/libtool-2.4.6/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch +++ b/parity.patches/libtool-2.4.6/0008-support-winnt-with-Parity-2-a-wrapper-around-MSVC.patch @@ -1,4 +1,4 @@ -From 445af14334f9ba04930101c208d91e523846d68c Mon Sep 17 00:00:00 2001 +From 1d1a4e9df94ae9a535bae4bd6548b66de321b604 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Tue, 2 May 2017 14:00:33 +0200 Subject: [PATCH 8/8] support winnt with Parity-2, a wrapper around MSVC @@ -18,7 +18,7 @@ create the import library NAME.lib. 7 files changed, 169 insertions(+), 44 deletions(-) diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index e02d5ea9..8aed79c0 100644 +index 8e172644..d40638ab 100644 --- a/build-aux/ltmain.in +++ b/build-aux/ltmain.in @@ -506,7 +506,7 @@ libtool_validate_options () @@ -174,7 +174,7 @@ index e02d5ea9..8aed79c0 100644 # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. func_warning "'-no-install' is ignored for $host" -@@ -6179,7 +6179,7 @@ func_mode_link () +@@ -6185,7 +6185,7 @@ func_mode_link () fi case $host in # special handling for platforms with PE-DLLs. @@ -183,7 +183,7 @@ index e02d5ea9..8aed79c0 100644 # Linker will automatically link against shared library if both # static and shared are present. Therefore, ensure we extract # symbols from the import library if a shared library is present -@@ -6323,7 +6323,7 @@ func_mode_link () +@@ -6329,7 +6329,7 @@ func_mode_link () if test -n "$library_names" && { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in @@ -192,7 +192,7 @@ index e02d5ea9..8aed79c0 100644 # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no -@@ -6393,7 +6393,7 @@ func_mode_link () +@@ -6399,7 +6399,7 @@ func_mode_link () elif test -n "$soname_spec"; then # bleh windows case $host in @@ -201,7 +201,7 @@ index e02d5ea9..8aed79c0 100644 func_arith $current - $age major=$func_arith_result versuffix=-$major -@@ -7303,7 +7303,7 @@ func_mode_link () +@@ -7309,7 +7309,7 @@ func_mode_link () if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in @@ -210,7 +210,7 @@ index e02d5ea9..8aed79c0 100644 # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) -@@ -7826,7 +7826,7 @@ EOF +@@ -7832,7 +7832,7 @@ EOF orig_export_symbols= case $host_os in @@ -219,7 +219,7 @@ index e02d5ea9..8aed79c0 100644 if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile func_dll_def_p "$export_symbols" || { -@@ -8496,7 +8496,7 @@ EOF +@@ -8502,7 +8502,7 @@ EOF esac fi case $host in @@ -228,7 +228,7 @@ index e02d5ea9..8aed79c0 100644 testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; -@@ -8574,7 +8574,7 @@ EOF +@@ -8580,7 +8580,7 @@ EOF # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. wrappers_required=false ;; @@ -237,7 +237,7 @@ index e02d5ea9..8aed79c0 100644 test yes = "$build_libtool_libs" || wrappers_required=false ;; *) -@@ -8727,7 +8727,7 @@ EOF +@@ -8733,7 +8733,7 @@ EOF *) exeext= ;; esac case $host in @@ -246,7 +246,7 @@ index e02d5ea9..8aed79c0 100644 func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result -@@ -8754,7 +8754,8 @@ EOF +@@ -8760,7 +8760,8 @@ EOF $opt_dry_run || { # note: this script will not be executed, so do not chmod. if test "x$build" = "x$host"; then @@ -256,7 +256,7 @@ index e02d5ea9..8aed79c0 100644 else func_emit_wrapper no > $func_ltwrapper_scriptname_result fi -@@ -9059,7 +9060,7 @@ EOF +@@ -9065,7 +9066,7 @@ EOF # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in From 5ce28959372d6091cd40ee589225051c5df456b7 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Wed, 11 Mar 2020 15:01:04 +0100 Subject: [PATCH 3/3] add ReleaseNotes for 2.0.1 --- ReleaseNotes.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 87e66b1..3520c97 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -22,6 +22,11 @@ used. This means you can now give a UNIX-style path to an executable built with parity, and it will understand it. Previously this was not possible, and all Windows executables would need Windows-style paths to work. +parity 2.0.1 +------------ + +Sync libtool patches to what is currently used at SSI. + parity 2.0.0 ------------