diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-05 11:33:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-08 15:33:08 +0100 |
| commit | f31b77d5b50a155c648bdab6ab7cd2dcd918c418 (patch) | |
| tree | aa088e5b0c286232383f9548bc5aad0656aacbf4 | |
| parent | ef49ccd5d9f1dddcb68539a9a1d3b4b37e64a6bf (diff) | |
new package firefox, obsolete python2
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
34 files changed, 885 insertions, 693 deletions
diff --git a/adk/tools/depmaker.c b/adk/tools/depmaker.c index 7b04b3781..69266d7ac 100644 --- a/adk/tools/depmaker.c +++ b/adk/tools/depmaker.c @@ -133,7 +133,6 @@ static char *parse_line(char *package, char *pkgvar, char *string, int checksym, } strncat(depvar, dep, strlen(dep)-5); if ((strncmp(depvar, "bc", 2) == 0) || - (strncmp(depvar, "bzip2", 5) == 0) || (strncmp(depvar, "file", 4) == 0) || (strncmp(depvar, "gawk", 4) == 0) || (strncmp(depvar, "grep", 4) == 0) || @@ -339,6 +338,7 @@ int main() { } } } else if (strncmp(buf, "HOST_BUILDDEP", 13) == 0) { + //printf("DEBUG: HOST_BUILDDEP found for %s\n", pkgdirp->d_name); asprintf(&string, "%s-host", pkgdirp->d_name); // check retval; string for NULL tmp = parse_line(string, NULL, buf, 2, 0, 0, &hprefix); diff --git a/package/automake/Makefile b/package/automake/Makefile index d908acf3b..7573250b0 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= automake -PKG_VERSION:= 1.15.1 -PKG_EXTRAVER:= 1.15 +PKG_VERSION:= 1.16.3 +PKG_EXTRAVER:= 1.16 PKG_RELEASE:= 1 -PKG_HASH:= af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf +PKG_HASH:= ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a PKG_DESCR:= tool for automatically generating makefiles PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host autoconf-host autoconf diff --git a/package/automake/patches/patch-Makefile_in b/package/automake/patches/patch-Makefile_in deleted file mode 100644 index 24682ad19..000000000 --- a/package/automake/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- automake-1.15.1.orig/Makefile.in 2017-06-18 19:35:04.000000000 +0200 -+++ automake-1.15.1/Makefile.in 2020-10-31 08:38:23.322590385 +0100 -@@ -710,7 +710,7 @@ update_mans = \ - $(AM_V_GEN): \ - && $(MKDIR_P) doc \ - && $(extend_PATH) \ -- && $(PERL) $(srcdir)/doc/help2man --output=$@ -+ && $(PERL) $(srcdir)/doc/help2man --no-discard-stderr --output=$@ - - amhello_sources = \ - doc/amhello/configure.ac \ diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index d5e0fb860..723d1abcc 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -31,7 +31,7 @@ $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS})) HOST_STYLE:= manual -HOST_MAKE_FILE:= Makefile +HOST_MAKE_FILE:= Makefile-libbz2_so ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FILE:= Makefile-libbz2_so @@ -50,8 +50,13 @@ host-build: PREFIX=${HOST_WRKINST}/usr ${HOST_ALL_TARGET}) bzip2-hostinstall: + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/include + $(CP) ${WRKBUILD}/bzlib.h ${STAGING_HOST_DIR}/usr/include + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/lib + $(CP) ${WRKBUILD}/libbz2.so* ${STAGING_HOST_DIR}/usr/lib + (cd ${STAGING_HOST_DIR}/usr/lib; ln -sf libbz2.so.1.0.8 libbz2.so) ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin - $(INSTALL_BIN) ${WRKBUILD}/bzip2 ${STAGING_HOST_DIR}/usr/bin/bzip2 + $(INSTALL_BIN) ${WRKBUILD}/bzip2-shared ${STAGING_HOST_DIR}/usr/bin/bzip2 do-install: ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include diff --git a/package/firefox/Makefile b/package/firefox/Makefile new file mode 100644 index 000000000..eb3cfeb9e --- /dev/null +++ b/package/firefox/Makefile @@ -0,0 +1,54 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= firefox +PKG_VERSION:= 108.0.1 +PKG_RELEASE:= 1 +PKG_HASH:= 9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea +PKG_DESCR:= www browser +PKG_SECTION:= app/browser +PKG_DEPENDS:= pango libfreetype fontconfig libxcomposite libxcursor +PKG_DEPENDS+= libgtk3 dbus-glib alsa-lib libatk harfbuzz +PKG_BUILDDEP:= python3-host nodejs-host pango freetype fontconfig libXcomposite +PKG_BUILDDEP+= libXcursor libgtk3 dbus-glib alsa-lib atk harfbuzz +PKG_SITES:= https://ftp.mozilla.org/pub/firefox/releases/$(PKG_VERSION)/source/ + +PKG_ARCH_DEPENDS:= aarch64 + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).source.tar.xz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +ifeq ($(ADK_TARGET_ARCH),aarch64) +TARGET_NAME:= aarch64-linux-gnu +endif + +CONFIG_STYLE:= minimal +CONFIGURE_ENV+= CROSS_COMPILE=1 \ + BINDGEN_CFLAGS="--sysroot /usr/$(TARGET_NAME)" \ + AS="$(GNU_TARGET_NAME)-gcc" +CONFIGURE_ARGS+= --prefix=/usr \ + --target=$(TARGET_NAME) \ + --with-toolchain-prefix=$(GNU_TARGET_NAME)- \ + --enable-application=browser \ + --enable-official-branding \ + --disable-audio-backends \ + --without-wasm-sandboxed-libraries \ + --disable-profiling \ + --with-clang-path=/usr/bin/clang-13 + +firefox-install: + $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin + $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib/firefox + $(CP) $(WRKINST)/usr/bin/firefox \ + $(IDIR_FIREFOX)/usr/bin + $(CP) $(WRKINST)/usr/lib/firefox/* \ + $(IDIR_FIREFOX)/usr/lib/firefox + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/glib/Makefile b/package/glib/Makefile index 438845919..18ad87240 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -12,7 +12,7 @@ PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcre zlib libffi PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre -HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python2-host gettext-host util-linux-host +HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host HOST_BUILDDEP+= pcre-host meson-host PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 12b640b83..118648eab 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -31,8 +31,7 @@ CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson -MESON_FLAGS+= -Dfreetype=disabled \ - -Dtests=disabled +MESON_FLAGS+= -Dtests=disabled host-postinstall: $(CP) $(WRKBUILD)/meson-private/harfbuzz.pc \ diff --git a/package/libtool/patches/patch-m4_libtool_m4 b/package/libtool/patches/patch-m4_libtool_m4 deleted file mode 100644 index a4e301ef5..000000000 --- a/package/libtool/patches/patch-m4_libtool_m4 +++ /dev/null @@ -1,20 +0,0 @@ ---- libtool-2.4.6.orig/m4/libtool.m4 2015-01-20 17:15:19.000000000 +0100 -+++ libtool-2.4.6/m4/libtool.m4 2015-06-04 11:48:09.000000000 +0200 -@@ -4950,7 +4950,7 @@ m4_if([$1], [CXX], [ - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- _LT_TAGVAR(hardcode_automatic, $1)=no -+ _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -@@ -6308,7 +6308,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1 - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported --_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index a8b52760d..7e5c3c00e 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxcb -PKG_VERSION:= 1.12 +PKG_VERSION:= 1.14 PKG_RELEASE:= 1 -PKG_HASH:= 092f147149d8a6410647a848378aaae749304d5b73e028ccb8306aa8a9e26f06 +PKG_HASH:= 2c7fcddd1da34d9b238c9caeda20d3bd7486456fc50b3cc6567185dbd5b0ad02 PKG_DESCR:= interface to the x window system protocol PKG_SECTION:= x11/libs -PKG_BUILDDEP+= python2 libpthread-stubs libxslt libXau xcb-proto +PKG_BUILDDEP:= python3 libpthread-stubs libxslt libXau xcb-proto HOST_BUILDDEP:= libXau-host libpthread-stubs-host xcb-proto-host PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev @@ -22,10 +22,10 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk HOST_STYLE:= auto -CONFIGURE_ENV+= PYTHON=$(PYTHON) +CONFIGURE_ENV+= PYTHONPATH=$(PYTHON) PYTHON=python3 libxcb-install: ${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 5835c98d7..20a1428b7 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,48 +4,33 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.9.4 +PKG_VERSION:= 2.10.3 PKG_RELEASE:= 1 -PKG_HASH:= ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c +PKG_HASH:= 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c PKG_DESCR:= xml parser and toolkit PKG_SECTION:= libs/data PKG_DEPENDS:= zlib -PKG_BUILDDEP:= libxml2-host python2 zlib -HOST_BUILDDEP:= python2-host +PKG_BUILDDEP:= libxml2-host python3 zlib +HOST_BUILDDEP:= python3-host PKG_URL:= http://www.xmlsoft.org/ -PKG_SITES:= http://xmlsoft.org/sources/ +PKG_SITES:= https://download.gnome.org/sources/libxml2/2.10/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON -PKGSD_LIBXML2_PYTHON:= xml python bindings -PKGSC_LIBXML2_PYTHON:= libs/misc -PKGSB_LIBXML2_PYTHON:= python2 -PKGSS_LIBXML2_PYTHON:= python2 - include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -$(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBXML2_PYTHON),$(PKGSC_LIBXML2_PYTHON))) - -include $(ADK_TOPDIR)/mk/python.mk -TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/python$(PYTHON_VERSION) -HOST_CPPFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/python$(PYTHON_VERSION) HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --with-python \ +HOST_CONFIGURE_ARGS+= --without-python \ --with-threads \ --without-iconv \ --without-lzma \ --without-zlib -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --without-c14n \ --without-debug \ - --without-docbook \ --with-catalog \ --with-html \ --without-ftp \ @@ -69,17 +54,12 @@ CONFIGURE_ARGS+= --without-c14n \ --with-xinclude \ --with-xpath \ --with-xptr \ - --with-python \ + --without-python \ --with-zlib='$(STAGING_TARGET_DIR)/usr' libxml2-install: $(INSTALL_DIR) $(IDIR_LIBXML2)/usr/lib $(CP) $(WRKINST)/usr/lib/libxml2.so* $(IDIR_LIBXML2)/usr/lib -libxml2-python-install: - $(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python/site-packages - $(CP) $(WRKINST)/usr/lib/python/site-packages/*.{so,py} \ - $(IDIR_LIBXML2_PYTHON)/usr/lib/python/site-packages - include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libxml2/patches/patch-Makefile_am b/package/libxml2/patches/patch-Makefile_am deleted file mode 100644 index f14a120d9..000000000 --- a/package/libxml2/patches/patch-Makefile_am +++ /dev/null @@ -1,14 +0,0 @@ ---- libxml2-2.9.2.orig/Makefile.am 2014-10-13 05:02:53.000000000 -0500 -+++ libxml2-2.9.2/Makefile.am 2015-02-11 12:51:49.858163855 -0600 -@@ -2,9 +2,9 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR) -+SUBDIRS = include . xstc $(PYTHON_SUBDIR) - --DIST_SUBDIRS = include . doc example python xstc -+DIST_SUBDIRS = include . python xstc - - AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include - diff --git a/package/libxml2/patches/patch-configure_ac b/package/libxml2/patches/patch-configure_ac deleted file mode 100644 index 6cbef4845..000000000 --- a/package/libxml2/patches/patch-configure_ac +++ /dev/null @@ -1,96 +0,0 @@ ---- libxml2-2.9.2.orig/configure.ac 2014-10-15 23:06:15.000000000 -0500 -+++ libxml2-2.9.2/configure.ac 2015-02-11 12:53:35.494162888 -0600 -@@ -837,62 +837,13 @@ if test "$with_python" != "no" ; then - echo Found python in environment PYTHON=$PYTHON - with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"` - else -- AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) -- fi -- fi -- fi -- fi -- if test "$PYTHON" != "" -- then -- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"` -- PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"` --# does not work as it produce a /usr/lib/python path instead of/usr/lib64/python --# --# PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` -- echo Found Python version $PYTHON_VERSION -- fi -- if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = "" -- then -- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -- else -- if test -r $prefix/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION -- else -- if test -r /usr/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION -- else -- if test -r $with_python/include/Python.h -- then -- PYTHON_INCLUDES=$with_python/include -- else -- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h -- fi -+ AC_PATH_PROG(PYTHON, python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) - fi - fi - fi - fi -- if test "$with_python_install_dir" != "" -- then -- PYTHON_SITE_PACKAGES="$with_python_install_dir" -- fi -- if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = "" -- then -- if test -d $libdir/python$PYTHON_VERSION/site-packages -- then -- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages -- else -- if test -d $with_python/lib/site-packages -- then -- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages -- else -- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` -- fi -- fi -- fi -+ PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes` -+ PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages - pythondir='$(PYTHON_SITE_PACKAGES)' - PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` - else -@@ -1065,26 +1016,7 @@ else - THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS" - ;; - *linux*) -- if test "${GCC}" = "yes" ; then -- GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` -- GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'` -- GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[[0-9]]*\.++' | sed 's+\..*++'` -- if test "${THREAD_LIBS}" = "-lpthread" ; then -- if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null -- then -- THREAD_LIBS="" -- BASE_THREAD_LIBS="-lpthread" -- else -- if expr ${GCC_MAJOR} \> 3 > /dev/null -- then -- THREAD_LIBS="" -- BASE_THREAD_LIBS="-lpthread" -- else -- echo old GCC disabling weak symbols for pthread -- fi -- fi -- fi -- fi -+ THREAD_LIBS="-lpthread" - ;; - esac - if test "$WITH_THREADS" = "1" ; then diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am deleted file mode 100644 index b3ac2539b..000000000 --- a/package/libxml2/patches/patch-python_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ ---- libxml2-2.9.2.orig/python/Makefile.am 2014-10-03 04:00:53.000000000 -0500 -+++ libxml2-2.9.2/python/Makefile.am 2015-02-11 12:53:07.150163147 -0600 -@@ -18,8 +18,7 @@ EXTRA_DIST = \ - if WITH_PYTHON - AM_CPPFLAGS = \ - -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -- -I$(PYTHON_INCLUDES) -+ -I$(top_srcdir)/include - - python_LTLIBRARIES = libxml2mod.la - diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 012ade2c1..47f1886ed 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libxslt -PKG_VERSION:= 1.1.29 +PKG_VERSION:= 1.1.37 PKG_RELEASE:= 1 -PKG_HASH:= b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce +PKG_HASH:= 3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4 PKG_DESCR:= xslt library PKG_SECTION:= libs/data PKG_DEPENDS:= libxml2 @@ -14,11 +14,9 @@ PKG_BUILDDEP:= libxslt-host libxml2 HOST_BUILDDEP:= libxml2-host PKG_NEEDS:= c++ PKG_URL:= http://xmlsoft.org/XSLT -PKG_SITES:= http://xmlsoft.org/sources/ +PKG_SITES:= https://download.gnome.org/sources/libxslt/1.1/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - PKG_SUBPKGS:= LIBXSLT XSLTPROC PKGSD_XSLTPROC:= xslt processor utility PKGSC_XSLTPROC:= sys/misc @@ -30,12 +28,14 @@ $(eval $(call HOST_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC})) +AUTOTOOL_STYLE:= autoreconf +HOST_LDFLAGS+= -lxml2 HOST_CONFIGURE_ARGS+= --without-python \ --without-crypto \ --with-libxml-prefix="${STAGING_HOST_DIR}/usr" \ --with-libxml-include-prefix="${STAGING_HOST_DIR}/usr/include/libxml2" \ --with-libxml-libs-prefix="${STAGING_HOST_DIR}/usr/lib" -AUTOTOOL_STYLE:= autoreconf +TARGET_LDFLAGS+= -lxml2 CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \ --with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \ --with-libxml-libs-prefix="${STAGING_TARGET_DIR}/usr/lib" \ diff --git a/package/libxslt/patches/patch-configure_ac b/package/libxslt/patches/patch-configure_ac new file mode 100644 index 000000000..a06cc1000 --- /dev/null +++ b/package/libxslt/patches/patch-configure_ac @@ -0,0 +1,12 @@ +--- libxslt-1.1.37.orig/configure.ac 2022-08-29 16:29:34.000000000 +0200 ++++ libxslt-1.1.37/configure.ac 2023-01-04 18:08:40.032975406 +0100 +@@ -401,9 +401,6 @@ if test "x$LIBXML_CONFIG_PREFIX" = "x" & + PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [ + WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`" + ], [ ]) +- else +- PKG_CHECK_MODULES_STATIC([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], +- [ ], [ ]) + fi + fi + diff --git a/package/libxslt/patches/patch-ltmain_sh b/package/libxslt/patches/patch-ltmain_sh new file mode 100644 index 000000000..6a8633366 --- /dev/null +++ b/package/libxslt/patches/patch-ltmain_sh @@ -0,0 +1,494 @@ +--- libxslt-1.1.37.orig/ltmain.sh 2022-08-17 15:33:08.000000000 +0200 ++++ libxslt-1.1.37/ltmain.sh 2023-01-04 18:05:32.281243849 +0100 +@@ -31,7 +31,7 @@ + + PROGRAM=libtool + PACKAGE=libtool +-VERSION="2.4.6 Debian-2.4.6-14" ++VERSION=2.4.6 + package_revision=2.4.6 + + +@@ -387,7 +387,7 @@ EXIT_SKIP=77 # $? = 77 is used to indi + # putting '$debug_cmd' at the start of all your functions, you can get + # bash to show function call trace with: + # +-# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name ++# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name + debug_cmd=${debug_cmd-":"} + exit_cmd=: + +@@ -1370,7 +1370,7 @@ func_lt_ver () + #! /bin/sh + + # Set a version string for this script. +-scriptversion=2015-10-07.11; # UTC ++scriptversion=2014-01-07.03; # UTC + + # A portable, pluggable option parser for Bourne shell. + # Written by Gary V. Vaughan, 2010 +@@ -1530,8 +1530,6 @@ func_run_hooks () + { + $debug_cmd + +- _G_rc_run_hooks=false +- + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; +@@ -1540,16 +1538,16 @@ func_run_hooks () + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do +- if eval $_G_hook '"$@"'; then +- # store returned options list back into positional +- # parameters for next 'cmd' execution. +- eval _G_hook_result=\$${_G_hook}_result +- eval set dummy "$_G_hook_result"; shift +- _G_rc_run_hooks=: +- fi ++ eval $_G_hook '"$@"' ++ ++ # store returned options list back into positional ++ # parameters for next 'cmd' execution. ++ eval _G_hook_result=\$${_G_hook}_result ++ eval set dummy "$_G_hook_result"; shift + done + +- $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result ++ func_quote_for_eval ${1+"$@"} ++ func_run_hooks_result=$func_quote_for_eval_result + } + + +@@ -1559,16 +1557,10 @@ func_run_hooks () + ## --------------- ## + + # In order to add your own option parsing hooks, you must accept the +-# full positional parameter list in your hook function, you may remove/edit +-# any options that you action, and then pass back the remaining unprocessed ++# full positional parameter list in your hook function, remove any ++# options that you action, and then pass back the remaining unprocessed + # options in '<hooked_function_name>_result', escaped suitably for +-# 'eval'. In this case you also must return $EXIT_SUCCESS to let the +-# hook's caller know that it should pay attention to +-# '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that +-# arguments are left untouched by the hook and therefore caller will ignore the +-# result variable. +-# +-# Like this: ++# 'eval'. Like this: + # + # my_options_prep () + # { +@@ -1578,11 +1570,9 @@ func_run_hooks () + # usage_message=$usage_message' + # -s, --silent don'\''t print informational messages + # ' +-# # No change in '$@' (ignored completely by this hook). There is +-# # no need to do the equivalent (but slower) action: +-# # func_quote_for_eval ${1+"$@"} +-# # my_options_prep_result=$func_quote_for_eval_result +-# false ++# ++# func_quote_for_eval ${1+"$@"} ++# my_options_prep_result=$func_quote_for_eval_result + # } + # func_add_hook func_options_prep my_options_prep + # +@@ -1591,37 +1581,25 @@ func_run_hooks () + # { + # $debug_cmd + # +-# args_changed=false +-# + # # Note that for efficiency, we parse as many options as we can + # # recognise in a loop before passing the remainder back to the + # # caller on the first unrecognised argument we encounter. + # while test $# -gt 0; do + # opt=$1; shift + # case $opt in +-# --silent|-s) opt_silent=: +-# args_changed=: +-# ;; ++# --silent|-s) opt_silent=: ;; + # # Separate non-argument short options: + # -s*) func_split_short_opt "$_G_opt" + # set dummy "$func_split_short_opt_name" \ + # "-$func_split_short_opt_arg" ${1+"$@"} + # shift +-# args_changed=: + # ;; +-# *) # Make sure the first unrecognised option "$_G_opt" +-# # is added back to "$@", we could need that later +-# # if $args_changed is true. +-# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; ++# *) set dummy "$_G_opt" "$*"; shift; break ;; + # esac + # done + # +-# if $args_changed; then +-# func_quote_for_eval ${1+"$@"} +-# my_silent_option_result=$func_quote_for_eval_result +-# fi +-# +-# $args_changed ++# func_quote_for_eval ${1+"$@"} ++# my_silent_option_result=$func_quote_for_eval_result + # } + # func_add_hook func_parse_options my_silent_option + # +@@ -1633,32 +1611,16 @@ func_run_hooks () + # $opt_silent && $opt_verbose && func_fatal_help "\ + # '--silent' and '--verbose' options are mutually exclusive." + # +-# false ++# func_quote_for_eval ${1+"$@"} ++# my_option_validation_result=$func_quote_for_eval_result + # } + # func_add_hook func_validate_options my_option_validation + # +-# You'll also need to manually amend $usage_message to reflect the extra ++# You'll alse need to manually amend $usage_message to reflect the extra + # options you parse. It's preferable to append if you can, so that + # multiple option parsing hooks can be added safely. + + +-# func_options_finish [ARG]... +-# ---------------------------- +-# Finishing the option parse loop (call 'func_options' hooks ATM). +-func_options_finish () +-{ +- $debug_cmd +- +- _G_func_options_finish_exit=false +- if func_run_hooks func_options ${1+"$@"}; then +- func_options_finish_result=$func_run_hooks_result +- _G_func_options_finish_exit=: +- fi +- +- $_G_func_options_finish_exit +-} +- +- + # func_options [ARG]... + # --------------------- + # All the functions called inside func_options are hookable. See the +@@ -1668,28 +1630,17 @@ func_options () + { + $debug_cmd + +- _G_rc_options=false +- +- for my_func in options_prep parse_options validate_options options_finish +- do +- if eval func_$my_func '${1+"$@"}'; then +- eval _G_res_var='$'"func_${my_func}_result" +- eval set dummy "$_G_res_var" ; shift +- _G_rc_options=: +- fi +- done ++ func_options_prep ${1+"$@"} ++ eval func_parse_options \ ++ ${func_options_prep_result+"$func_options_prep_result"} ++ eval func_validate_options \ ++ ${func_parse_options_result+"$func_parse_options_result"} + +- # Save modified positional parameters for caller. As a top-level +- # options-parser function we always need to set the 'func_options_result' +- # variable (regardless the $_G_rc_options value). +- if $_G_rc_options; then +- func_options_result=$_G_res_var +- else +- func_quote_for_eval ${1+"$@"} +- func_options_result=$func_quote_for_eval_result +- fi ++ eval func_run_hooks func_options \ ++ ${func_validate_options_result+ |