diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/libxslt/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/libxslt/files')
6 files changed, 188 insertions, 0 deletions
diff --git a/dev-libs/libxslt/files/libxslt-1.1.26-disable_static_modules.patch b/dev-libs/libxslt/files/libxslt-1.1.26-disable_static_modules.patch new file mode 100644 index 000000000000..fad067ff4348 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.26-disable_static_modules.patch @@ -0,0 +1,12 @@ +--- python/Makefile.am ++++ python/Makefile.am +@@ -24,7 +24,8 @@ + libxslt-python-api.xml \ + $(DOCS) + +-libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version ++libxsltmod_la_CPPFLAGS = -shared ++libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -shared + + if WITH_PYTHON + mylibs = \ diff --git a/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch b/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch new file mode 100644 index 000000000000..352a75352092 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch @@ -0,0 +1,26 @@ +From 4514fed897ab0911097e54715e7936048bf43dd9 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sat, 22 Sep 2012 16:37:36 -0400 +Subject: [PATCH] Gentoo uses /usr/bin/python-config with automatic version + detection + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 0d7ba86..3c8a5ad 100644 +--- a/configure.in ++++ b/configure.in +@@ -353,7 +353,7 @@ except: print 0"` + PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` + fi + fi +- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` ++ PYTHON_LIBS=`python-config --libs` + fi + if test "$with_python" != "" + then +-- +1.7.12 + diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch b/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch new file mode 100644 index 000000000000..bc9ff7fe3594 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch @@ -0,0 +1,46 @@ +From 1fc82ea63f16efc0d607b39a162e3032d7c2d602 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 3 Sep 2014 11:21:01 +0200 +Subject: [PATCH] Use AC_PATH_TOOL to find libgcrypt-config and xml2-config + +Using AC_PATH_TOOL prefers ${CHOST}-prefixed tools over 'bare' ones, +therefore improving support for cross-compilation and multilib. This +is useful for environment where libgcrypt-config and xml2-config +correspond to the build host environment, while +${CHOST}-libgcrypt-config and ${CHOST}-xml2-config are installed for +each supported build targets. + +Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=725635 +Fixes: https://bugs.gentoo.org/show_bug.cgi?id=518728 +--- + configure.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index a861e90..f1639a8 100644 +--- a/configure.in ++++ b/configure.in +@@ -393,7 +393,7 @@ case $host in + CRYPTO_TESTDIR=crypto + ;; + *) +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + if test "$LIBGCRYPT_CONFIG" != "no" ; then + LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` + if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") +@@ -507,9 +507,9 @@ AC_SUBST(LIBXML_REQUIRED_VERSION) + AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) + if test "x$LIBXML_CONFIG_PREFIX" != "x" + then +- XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config ++ AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false], [${LIBXML_CONFIG_PREFIX}/bin]) + else +- XML_CONFIG=xml2-config ++ AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) + fi + + dnl +-- +2.1.0 + diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch b/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch new file mode 100644 index 000000000000..74ee935e4d8d --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch @@ -0,0 +1,30 @@ +From 4eeed7de3fa90e27658c48cb06f034da43b4f057 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 4 Mar 2014 00:10:37 -0500 +Subject: [PATCH] configure: use AC_PATH_TOOL to find libgcrypt-config + +Since libgcrypt-config is used to find host system libraries, we should +be using AC_PATH_TOOL, not AC_PATH_PROG, for proper cross-compiling and +multilib support. + +https://bugzilla.gnome.org/show_bug.cgi?id=725635 +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index a861e90..8328625 100644 +--- a/configure.in ++++ b/configure.in +@@ -393,7 +393,7 @@ case $host in + CRYPTO_TESTDIR=crypto + ;; + *) +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + if test "$LIBGCRYPT_CONFIG" != "no" ; then + LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` + if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") +-- +1.9.0 + diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch new file mode 100644 index 000000000000..019f3253d876 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch @@ -0,0 +1,36 @@ +From 1671e1004e18fa9bbce410050d1365374ececb6a Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 18 Dec 2012 02:22:47 -0500 +Subject: [PATCH] build/test/install python bindings manually + +To support building for multiple python ABIs, we want to skip checks for +python in configure, and build/test/install python bindings manually. +--- + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index fc8d5a8..6312c37 100644 +--- a/configure.in ++++ b/configure.in +@@ -296,7 +296,7 @@ PYTHON_INCLUDES= + PYTHON_SITE_PACKAGES= + pythondir= + AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) +-if test "$with_python" != "no" ; then ++if false ; then + if test -x "$with_python/bin/python" + then + echo Found python in $with_python/bin/python +@@ -365,7 +365,7 @@ except: print 0"` + pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' + fi + fi +-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") ++AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no") + if test "$PYTHON_INCLUDES" != "" + then + PYTHON_SUBDIR=python +-- +1.8.0.2 + diff --git a/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch b/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch new file mode 100644 index 000000000000..d6aaae4e9df0 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt.m4-libxslt-1.1.26.patch @@ -0,0 +1,38 @@ +diff -ur libxslt-1.1.26.orig/libxslt.m4 libxslt-1.1.26/libxslt.m4 +--- libxslt-1.1.26.orig/libxslt.m4 2009-05-12 09:29:34.000000000 +0300 ++++ libxslt-1.1.26/libxslt.m4 2009-10-07 17:03:04.000000000 +0300 +@@ -52,8 +52,10 @@ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_xslttest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" ++ ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $XSLT_CFLAGS" ++ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" + LIBS="$XSLT_LIBS $LIBS" + dnl + dnl Now check if the installed libxslt is sufficiently new. +@@ -138,6 +140,7 @@ + } + ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi +@@ -158,6 +161,7 @@ + else + echo "*** Could not run libxslt test program, checking why..." + CFLAGS="$CFLAGS $XSLT_CFLAGS" ++ CXXFLAGS="$CXXFLAGS $XSLT_CFLAGS" + LIBS="$LIBS $XSLT_LIBS" + AC_TRY_LINK([ + #include <libxslt/xslt.h> +@@ -177,6 +181,7 @@ + echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you" + echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi |