From e145177a811ba8539a51273eb8878f4c740df654 Mon Sep 17 00:00:00 2001 From: "Daisuke Fujimura (fd0)" Date: Fri, 10 Jan 2025 18:31:53 +0900 Subject: [PATCH] see-3.1.1424 (rebuild with gcc-12.4.0) --- see/README | 43 +++++---- see/see-3.1.1424-1bl3.src.patch | 78 --------------- ...1bl3.cygport => see-3.1.1424-1bl4.cygport} | 13 ++- see/see-3.1.1424-1bl4.src.patch | 94 +++++++++++++++++++ 4 files changed, 128 insertions(+), 100 deletions(-) delete mode 100644 see/see-3.1.1424-1bl3.src.patch rename see/{see-3.1.1424-1bl3.cygport => see-3.1.1424-1bl4.cygport} (66%) create mode 100644 see/see-3.1.1424-1bl4.src.patch diff --git a/see/README b/see/README index 053fda55a..034267af8 100644 --- a/see/README +++ b/see/README @@ -3,32 +3,34 @@ see A full JavaScript interpreter and runtime library in C. Runtime requirements: - bash-4.3.42-4 - cygwin-2.2.1-1 - libgc-devel-7.2d-2 - libgc1-7.2d-2 - libltdl7-2.4.6-2 - libpcre-devel-8.37-2 - libpcre1-8.37-2 - libsee-devel-3.1.1424-1bl3 - libsee1-3.1.1424-1bl3 + bash-5.2.21-1 + cygwin-3.5.4-1 + libgc-devel-8.2.8-1 + libgc1-8.2.8-1 + libltdl7-2.5.3-1 + libpcre-devel-8.45-1 + libpcre1-8.45-1 + libsee-devel-3.1.1424-1bl4 + libsee1-3.1.1424-1bl4 + pkg-config-2.3.0-1 Build requirements: (besides corresponding -devel packages) - autoconf-13-1 - automake-9-1 - binutils-2.25-2 - cygport-0.20.2-1 - gcc-core-4.9.3-1 - gcc-g++-4.9.3-1 - libtool-2.4.6-2 - make-4.1-1 + autoconf-15-2 + automake-20240607-1 + binutils-2.43.1-1 + cygport-0.36.9-1 + gcc-core-12.4.0-3 + libgc-devel-8.2.8-1 + libpcre-devel-8.45-1 + libtool-2.5.3-1 + make-4.4.1-2 Canonical website: - http://www.adaptive-enterprises.com.au/~d/software/see/ + https://www.adaptive-enterprises.com.au/~d/software/see/ Canonical download: - http://www.adaptive-enterprises.com.au/~d/software/see/see-3.1.1424.tar.gz + https://www.adaptive-enterprises.com.au/~d/software/see/see-3.1.1424.tar.gz ------------------------------------------- @@ -93,6 +95,9 @@ Files included in the binary package: Port Notes: +----- version 3.1.1424-1bl4 ----- +Rebuild with gcc-12.4.0 + ----- version 3.1.1424-1bl3 ----- Rebuild on x86_64 diff --git a/see/see-3.1.1424-1bl3.src.patch b/see/see-3.1.1424-1bl3.src.patch deleted file mode 100644 index 38c8eca29..000000000 --- a/see/see-3.1.1424-1bl3.src.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 -x libltdl origsrc/see-3.1.1424/configure.ac src/see-3.1.1424/configure.ac ---- origsrc/see-3.1.1424/configure.ac 2009-04-27 06:05:18.000000000 +0900 -+++ src/see-3.1.1424/configure.ac 2015-10-25 14:33:54.556873200 +0900 -@@ -30,11 +30,9 @@ AC_PROG_CC - AM_PROG_CC_C_O - AC_PROG_SED - --AC_LIBLTDL_CONVENIENCE([libltdl]) --AC_LIBTOOL_DLOPEN - AC_PROG_LIBTOOL -+LTDL_INIT([installable]) - dnl AC_LIB_LTDL --AC_CONFIG_SUBDIRS([libltdl]) - AC_SUBST([LIBLTDL]) - AC_SUBST([LTDLINCL]) - AC_SUBST([LIBSEE_LIBS]) -@@ -213,8 +211,8 @@ SEE_ARG_ENABLE(longjmperror,[yes], - [Define if you want SEE to catch longjmp corruption]) - ]) - --SEE_ARG_ENABLE(native-dtoa,[auto], -- [dtoa from libc], -+SEE_ARG_ENABLE(native-dtoa,[no], -+ [dtoa from libc],, - [enable_native_dtoa=yes - AC_CHECK_FUNCS([strtod dtoa freedtoa],,[enable_native_dtoa=no]) - ]) -@@ -571,7 +569,7 @@ fi - - AC_CACHE_CHECK([platform class], [ac_cv_see_platform], [ - case "$build_os" in -- cygwin*|mingw*|pw32) ac_cv_see_platform=win32;; -+ mingw*|pw32) ac_cv_see_platform=win32;; - *) ac_cv_see_platform=posix;; - esac]) - AM_CONDITIONAL(PLATFORM_POSIX, test x"$ac_cv_see_platform" = x"posix") -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 -x libltdl origsrc/see-3.1.1424/libsee/Makefile.am src/see-3.1.1424/libsee/Makefile.am ---- origsrc/see-3.1.1424/libsee/Makefile.am 2009-04-27 06:04:58.000000000 +0900 -+++ src/see-3.1.1424/libsee/Makefile.am 2015-10-25 14:33:54.570713000 +0900 -@@ -59,8 +59,8 @@ if PLATFORM_POSIX - libsee_la_SOURCES += platform_posix.c - endif - --libsee_la_LIBADD= @LIBOBJS@ --libsee_la_LDFLAGS= -version-info $(libsee_version_info) -+libsee_la_LIBADD= @LIBOBJS@ $(LIBSEE_LIBS) -+libsee_la_LDFLAGS= -no-undefined -version-info $(libsee_version_info) - - EXTRA_DIST= string.pl string.defs - PERL= @PERL@ -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 -x libltdl origsrc/see-3.1.1424/shell/Makefile.am src/see-3.1.1424/shell/Makefile.am ---- origsrc/see-3.1.1424/shell/Makefile.am 2009-04-27 06:04:58.000000000 +0900 -+++ src/see-3.1.1424/shell/Makefile.am 2015-10-25 14:33:54.570713000 +0900 -@@ -24,7 +24,8 @@ see_shell_static_LDFLAGS= -static - - pkglib_LTLIBRARIES= libFile.la - libFile_la_SOURCES= mod_File.c --libFile_la_LDFLAGS= -module -+libFile_la_LDFLAGS= -module -no-undefined -avoid-version -+libFile_la_LIBADD = $(top_builddir)/libsee/libsee.la - - #-- the following DEFS line tries to avoid the -I../include/see - DEFS = @DEFS@ -I. -I$(srcdir) -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 -x libltdl origsrc/see-3.1.1424/shell/module.c src/see-3.1.1424/shell/module.c ---- origsrc/see-3.1.1424/shell/module.c 2009-04-27 06:04:58.000000000 +0900 -+++ src/see-3.1.1424/shell/module.c 2015-10-25 14:33:54.570713000 +0900 -@@ -45,7 +45,11 @@ load_module(name) - if (!handle && strchr(name, '/') == 0 && - strlen(name) + 3 < FILENAME_MAX) - { -+#if defined(__CYGWIN__) -+ memcpy(libname, "cyg", 3); -+#else - memcpy(libname, "lib", 3); -+#endif - strcpy(libname + 3, name); - handle = lt_dlopenext(libname); - } diff --git a/see/see-3.1.1424-1bl3.cygport b/see/see-3.1.1424-1bl4.cygport similarity index 66% rename from see/see-3.1.1424-1bl3.cygport rename to see/see-3.1.1424-1bl4.cygport index 53ef324ed..2e32cfebe 100644 --- a/see/see-3.1.1424-1bl3.cygport +++ b/see/see-3.1.1424-1bl4.cygport @@ -1,10 +1,16 @@ -HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/${PN}/" -SRC_URI="http://www.adaptive-enterprises.com.au/~d/software/${PN}/${P}.tar.gz" +HOMEPAGE="https://www.adaptive-enterprises.com.au/~d/software/${PN}/" +SRC_URI="https://www.adaptive-enterprises.com.au/~d/software/${PN}/${P}.tar.gz" CATEGORY="Interpreters" SUMMARY="Simple ECMAScript Engine" DESCRIPTION="A full JavaScript interpreter and runtime library in C." +LICENSE="BSD-3-Clause" +LICENSE_SPDX="SPDX-License-Identifier: BSD-3-Clause" +LICENSE_URI="COPYING" + +BUILD_REQUIRES="libgc-devel libpcre-devel" + CYGCONF_ARGS=" --enable-native-dtoa=yes --with-readline=yes @@ -14,6 +20,7 @@ CYGCONF_ARGS=" HTMLDOCS=" doc/*.html " + DIFF_EXCLUDES=" libltdl " @@ -29,7 +36,7 @@ see_CONTENTS=" usr/share " libsee1_CONTENTS=" - usr/bin/*.dll + usr/bin/cyg*-1.dll " libsee_devel_CONTENTS=" usr/bin/lib${PN}-config diff --git a/see/see-3.1.1424-1bl4.src.patch b/see/see-3.1.1424-1bl4.src.patch new file mode 100644 index 000000000..338bef4b1 --- /dev/null +++ b/see/see-3.1.1424-1bl4.src.patch @@ -0,0 +1,94 @@ +--- origsrc/see-3.1.1424/configure.ac 2009-04-27 06:05:18.000000000 +0900 ++++ src/see-3.1.1424/configure.ac 2025-01-10 17:00:40.795575700 +0900 +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + + AC_INIT([see], +- [3.1.]esyscmd((svnversion .||echo 0)|tr : _|tr -d \\012), ++ [3.1.1424], + [leonard@users.sourceforge.net]) + AC_PREREQ(2.52) + AM_INIT_AUTOMAKE +@@ -30,11 +30,9 @@ AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_SED + +-AC_LIBLTDL_CONVENIENCE([libltdl]) +-AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL ++LTDL_INIT([installable]) + dnl AC_LIB_LTDL +-AC_CONFIG_SUBDIRS([libltdl]) + AC_SUBST([LIBLTDL]) + AC_SUBST([LTDLINCL]) + AC_SUBST([LIBSEE_LIBS]) +@@ -213,8 +211,8 @@ SEE_ARG_ENABLE(longjmperror,[yes], + [Define if you want SEE to catch longjmp corruption]) + ]) + +-SEE_ARG_ENABLE(native-dtoa,[auto], +- [dtoa from libc], ++SEE_ARG_ENABLE(native-dtoa,[no], ++ [dtoa from libc],, + [enable_native_dtoa=yes + AC_CHECK_FUNCS([strtod dtoa freedtoa],,[enable_native_dtoa=no]) + ]) +@@ -571,7 +569,7 @@ fi + + AC_CACHE_CHECK([platform class], [ac_cv_see_platform], [ + case "$build_os" in +- cygwin*|mingw*|pw32) ac_cv_see_platform=win32;; ++ mingw*|pw32) ac_cv_see_platform=win32;; + *) ac_cv_see_platform=posix;; + esac]) + AM_CONDITIONAL(PLATFORM_POSIX, test x"$ac_cv_see_platform" = x"posix") +--- origsrc/see-3.1.1424/libsee/Makefile.am 2009-04-27 06:04:58.000000000 +0900 ++++ src/see-3.1.1424/libsee/Makefile.am 2025-01-10 16:31:43.925543800 +0900 +@@ -59,8 +59,8 @@ if PLATFORM_POSIX + libsee_la_SOURCES += platform_posix.c + endif + +-libsee_la_LIBADD= @LIBOBJS@ +-libsee_la_LDFLAGS= -version-info $(libsee_version_info) ++libsee_la_LIBADD= @LIBOBJS@ $(LIBSEE_LIBS) ++libsee_la_LDFLAGS= -no-undefined -version-info $(libsee_version_info) + + EXTRA_DIST= string.pl string.defs + PERL= @PERL@ +--- origsrc/see-3.1.1424/libsee/regex_pcre.c 2009-04-27 06:04:58.000000000 +0900 ++++ src/see-3.1.1424/libsee/regex_pcre.c 2025-01-10 16:45:14.301696400 +0900 +@@ -57,7 +57,7 @@ + #include "dprint.h" + + #ifndef NDEBUG +-int SEE_regex_debug; ++extern int SEE_regex_debug; + #endif + + struct regex_pcre { +--- origsrc/see-3.1.1424/shell/Makefile.am 2009-04-27 06:04:58.000000000 +0900 ++++ src/see-3.1.1424/shell/Makefile.am 2025-01-10 16:31:43.925543800 +0900 +@@ -24,7 +24,8 @@ see_shell_static_LDFLAGS= -static + + pkglib_LTLIBRARIES= libFile.la + libFile_la_SOURCES= mod_File.c +-libFile_la_LDFLAGS= -module ++libFile_la_LDFLAGS= -module -no-undefined -avoid-version ++libFile_la_LIBADD = $(top_builddir)/libsee/libsee.la + + #-- the following DEFS line tries to avoid the -I../include/see + DEFS = @DEFS@ -I. -I$(srcdir) +--- origsrc/see-3.1.1424/shell/module.c 2009-04-27 06:04:58.000000000 +0900 ++++ src/see-3.1.1424/shell/module.c 2025-01-10 16:31:43.925543800 +0900 +@@ -45,7 +45,11 @@ load_module(name) + if (!handle && strchr(name, '/') == 0 && + strlen(name) + 3 < FILENAME_MAX) + { ++#if defined(__CYGWIN__) ++ memcpy(libname, "cyg", 3); ++#else + memcpy(libname, "lib", 3); ++#endif + strcpy(libname + 3, name); + handle = lt_dlopenext(libname); + }