some work on libpsl

3 files changed, 50 insertions, 1 deletions

diff --git a/build_stage3.sh b/build_stage3.sh
index f3bca7c..bf08da6 100755
--- a/build_stage3.sh
+++ b/build_stage3.sh
@@ -109,7 +109,6 @@ xfsprogs
 
 #~ linux build full with mkinitcpio and modules
 
-
 #  systemd: libgcrypt libmicrohttpd libxslt python-lxml quota-tools gnu-efi-libs meson
 
 #~ pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman     
diff --git a/i486-stage3/libpsl/DESCR b/i486-stage3/libpsl/DESCR
index e80b78f..a6a7feb 100644
--- a/i486-stage3/libpsl/DESCR
+++ b/i486-stage3/libpsl/DESCR
@@ -9,3 +9,12 @@ sed -i "s@--enable-gtk-doc@--disable-gtk-doc@" PKGBUILD
 sed -i "/makedepends=/s/'libxslt'//" PKGBUILD
 sed -i "s@--enable-man@--disable-man@" PKGBUILD
 
+# patching xsltproc in --disable-man fix, see https://github.com/rockdaboot/libpsl/issues/92
+sed -i 's@source=(@source=(libpsl-0.19.1-configure-disable-man-no-xsltproc.patch @' PKGBUILD
+sed -i "s@sha512sums=(@sha512sums=('48f2d7c407f42e8b6ddfbbacad757c1ed916c8ae2062d85af2365821f3d9cb028fa3b43b5a4e8eb807034eb812ea0ecb1c727243307b09e01f1ddb55cff5368b' @" PKGBUILD
+sed -i '/autoreconf/ i \  patch -Np1 -i "${srcdir}/libpsl-0.19.1-configure-disable-man-no-xsltproc.patch"' PKGBUILD
+
+# TODO: # src/psl-make-dafsa needs python 2.7+, AM_PATH_PYTHON([2.7]),
+# can this be precomputed?
+# psl-make-dafsa using PSL file /usr/share/publicsuffix/effective_tld_names.dat
+
diff --git a/i486-stage3/libpsl/libpsl-0.19.1-configure-disable-man-no-xsltproc.patch b/i486-stage3/libpsl/libpsl-0.19.1-configure-disable-man-no-xsltproc.patch
new file mode 100644
index 0000000..b912c44
--- /dev/null
+++ b/i486-stage3/libpsl/libpsl-0.19.1-configure-disable-man-no-xsltproc.patch
@@ -0,0 +1,41 @@
+diff -rauN libpsl-0.19.1/configure.ac libpsl-0.19.1-configure-disable-man-no-xsltproc-patch/configure.ac
+--- libpsl-0.19.1/configure.ac	2017-11-09 15:37:11.000000000 +0100
++++ libpsl-0.19.1-configure-disable-man-no-xsltproc-patch/configure.ac	2018-03-06 19:58:33.473353671 +0100
+@@ -53,24 +53,20 @@
+ #
+ # enable creation of man pages
+ #
+-AC_ARG_ENABLE(man,[AC_HELP_STRING([--enable-man],
+-                                  [generate man pages [default=auto]])],enable_man=yes,enable_man=no)
+-AS_IF([test "$enable_man" != no], [
+-  AC_PATH_PROG([XSLTPROC], [xsltproc])
+-  AS_IF([test -z "$XSLTPROC"], [
+-    AS_IF([test "$enable_man" = yes], [
+-      AC_MSG_ERROR([xsltproc is required for --enable-man])
+-    ])
+-    enable_man=no
++enable_man=no
++AC_ARG_ENABLE([man],
++  [AC_HELP_STRING([--enable-man], [generate man pages [default=auto]])],
++  [
++    if test "$enableval" = yes; then
++      enable_man=yes
++      AC_PATH_PROG([XSLTPROC], [xsltproc])
++      AS_IF([test -z "$XSLTPROC"], [
++        AC_MSG_ERROR([xsltproc is required for --enable-man])
++        enable_man="no (xsltproc not found)"
++      ])
++    fi
+   ])
+-])
+-AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+-AC_MSG_CHECKING([whether to generate man pages])
+-AS_IF([ test "$enable_man" != no ], [
+-  AC_MSG_RESULT([yes])
+-], [
+-  AC_MSG_RESULT([no])
+-])
++AM_CONDITIONAL(ENABLE_MAN, test x$enable_man = xyes)
+ 
+ # src/psl-make-dafsa needs python 2.7+
+ AM_PATH_PYTHON([2.7])