public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bf882cc8085caa99aedb2c6b46eb6d567063dd09
@ 2021-05-12 10:39 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2021-05-12 10:39 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 9560 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  bf882cc8085caa99aedb2c6b46eb6d567063dd09 (commit)
       via  5fe1a74adfb8a776cdddb0de832c9e9f4dc12041 (commit)
       via  607754d63d6fab7b9e5535f4576b50a3c2df7d14 (commit)
       via  f1d3be86567571d66ec8452d9f037fb1805aae4e (commit)
      from  c52cffd5cfbf2e4a8fdddf3ab13b74f0e4659413 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bf882cc8085caa99aedb2c6b46eb6d567063dd09
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 12 10:38:54 2021 +0000

    core157: Ship libxslt
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5fe1a74adfb8a776cdddb0de832c9e9f4dc12041
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue May 11 21:16:39 2021 +0200

    libxslt: Update to remove python2 modules and disable static libraries
    
    - Add --without-python and --disable-static to the configure section
       python2 modules not required for libxslt use in IPFire
       disable build of static libraries
    - Update rootfile
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 607754d63d6fab7b9e5535f4576b50a3c2df7d14
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue May 11 21:16:05 2021 +0200

    libxml2: Update to disable python2 modules
    
    - Added --without-python to configure section to not build the python2
      modules which are not required for libxml2 use in IPFire
    - Update rootfile
    
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f1d3be86567571d66ec8452d9f037fb1805aae4e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 12 09:42:27 2021 +0000

    dnsdist: Only build for x86_64
    
    It looks like 32 bit architectures are not supported at all by this
    program any more.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/libxml2                    | 58 ----------------------
 config/rootfiles/common/libxslt                    |  5 --
 .../{oldcore/91 => core/157}/filelists/libxslt     |  0
 lfs/dnsdist                                        |  2 +-
 lfs/libxml2                                        |  6 ++-
 lfs/libxslt                                        |  5 +-
 6 files changed, 10 insertions(+), 66 deletions(-)
 copy config/rootfiles/{oldcore/91 => core/157}/filelists/libxslt (100%)

Difference in files:
diff --git a/config/rootfiles/common/libxml2 b/config/rootfiles/common/libxml2
index 83253eaa1..a1176d7af 100644
--- a/config/rootfiles/common/libxml2
+++ b/config/rootfiles/common/libxml2
@@ -57,10 +57,6 @@
 usr/lib/libxml2.so.2
 usr/lib/libxml2.so.2.9.10
 #usr/lib/pkgconfig/libxml-2.0.pc
-usr/lib/python2.7/site-packages/drv_libxml2.py
-usr/lib/python2.7/site-packages/libxml2.py
-#usr/lib/python2.7/site-packages/libxml2mod.la
-usr/lib/python2.7/site-packages/libxml2mod.so
 #usr/lib/xml2Conf.sh
 #usr/share/aclocal/libxml.m4
 #usr/share/doc/libxml2-2.9.10
@@ -222,60 +218,6 @@ usr/lib/python2.7/site-packages/libxml2mod.so
 #usr/share/doc/libxml2-2.9.10/html/xpath1.res
 #usr/share/doc/libxml2-2.9.10/html/xpath2.c
 #usr/share/doc/libxml2-2.9.10/html/xpath2.res
-#usr/share/doc/libxml2-python-2.9.10
-#usr/share/doc/libxml2-python-2.9.10/TODO
-#usr/share/doc/libxml2-python-2.9.10/examples
-#usr/share/doc/libxml2-python-2.9.10/examples/attribs.py
-#usr/share/doc/libxml2-python-2.9.10/examples/build.py
-#usr/share/doc/libxml2-python-2.9.10/examples/compareNodes.py
-#usr/share/doc/libxml2-python-2.9.10/examples/ctxterror.py
-#usr/share/doc/libxml2-python-2.9.10/examples/cutnpaste.py
-#usr/share/doc/libxml2-python-2.9.10/examples/dtdvalid.py
-#usr/share/doc/libxml2-python-2.9.10/examples/error.py
-#usr/share/doc/libxml2-python-2.9.10/examples/inbuf.py
-#usr/share/doc/libxml2-python-2.9.10/examples/indexes.py
-#usr/share/doc/libxml2-python-2.9.10/examples/input_callback.py
-#usr/share/doc/libxml2-python-2.9.10/examples/invalid.xml
-#usr/share/doc/libxml2-python-2.9.10/examples/nsdel.py
-#usr/share/doc/libxml2-python-2.9.10/examples/outbuf.py
-#usr/share/doc/libxml2-python-2.9.10/examples/push.py
-#usr/share/doc/libxml2-python-2.9.10/examples/pushSAX.py
-#usr/share/doc/libxml2-python-2.9.10/examples/pushSAXhtml.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader2.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader3.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader4.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader5.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader6.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader7.py
-#usr/share/doc/libxml2-python-2.9.10/examples/reader8.py
-#usr/share/doc/libxml2-python-2.9.10/examples/readererr.py
-#usr/share/doc/libxml2-python-2.9.10/examples/readernext.py
-#usr/share/doc/libxml2-python-2.9.10/examples/regexp.py
-#usr/share/doc/libxml2-python-2.9.10/examples/relaxng.py
-#usr/share/doc/libxml2-python-2.9.10/examples/resolver.py
-#usr/share/doc/libxml2-python-2.9.10/examples/schema.py
-#usr/share/doc/libxml2-python-2.9.10/examples/serialize.py
-#usr/share/doc/libxml2-python-2.9.10/examples/sync.py
-#usr/share/doc/libxml2-python-2.9.10/examples/test.dtd
-#usr/share/doc/libxml2-python-2.9.10/examples/thread2.py
-#usr/share/doc/libxml2-python-2.9.10/examples/tst.py
-#usr/share/doc/libxml2-python-2.9.10/examples/tst.xml
-#usr/share/doc/libxml2-python-2.9.10/examples/tstLastError.py
-#usr/share/doc/libxml2-python-2.9.10/examples/tstURI.py
-#usr/share/doc/libxml2-python-2.9.10/examples/tstmem.py
-#usr/share/doc/libxml2-python-2.9.10/examples/tstxpath.py
-#usr/share/doc/libxml2-python-2.9.10/examples/valid.xml
-#usr/share/doc/libxml2-python-2.9.10/examples/validDTD.py
-#usr/share/doc/libxml2-python-2.9.10/examples/validRNG.py
-#usr/share/doc/libxml2-python-2.9.10/examples/validSchemas.py
-#usr/share/doc/libxml2-python-2.9.10/examples/validate.py
-#usr/share/doc/libxml2-python-2.9.10/examples/walker.py
-#usr/share/doc/libxml2-python-2.9.10/examples/xpath.py
-#usr/share/doc/libxml2-python-2.9.10/examples/xpathext.py
-#usr/share/doc/libxml2-python-2.9.10/examples/xpathleak.py
-#usr/share/doc/libxml2-python-2.9.10/examples/xpathns.py
-#usr/share/doc/libxml2-python-2.9.10/examples/xpathret.py
 #usr/share/gtk-doc
 #usr/share/gtk-doc/html
 #usr/share/gtk-doc/html/libxml2
diff --git a/config/rootfiles/common/libxslt b/config/rootfiles/common/libxslt
index be00b2426..3c8d144a5 100644
--- a/config/rootfiles/common/libxslt
+++ b/config/rootfiles/common/libxslt
@@ -39,11 +39,6 @@ usr/lib/libxslt.so.1
 usr/lib/libxslt.so.1.1.28
 #usr/lib/pkgconfig/libexslt.pc
 #usr/lib/pkgconfig/libxslt.pc
-usr/lib/python2.7/site-packages/libxml2.pyc
-#usr/lib/python2.7/site-packages/libxslt.py
-#usr/lib/python2.7/site-packages/libxsltmod.a
-#usr/lib/python2.7/site-packages/libxsltmod.la
-usr/lib/python2.7/site-packages/libxsltmod.so
 #usr/lib/xsltConf.sh
 #usr/share/aclocal/libxslt.m4
 #usr/share/doc/libxslt-1.1.28
diff --git a/config/rootfiles/core/157/filelists/libxslt b/config/rootfiles/core/157/filelists/libxslt
new file mode 120000
index 000000000..bf9d76609
--- /dev/null
+++ b/config/rootfiles/core/157/filelists/libxslt
@@ -0,0 +1 @@
+../../../common/libxslt
\ No newline at end of file
diff --git a/lfs/dnsdist b/lfs/dnsdist
index aaebeec0d..3c30b4213 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = x86_64 i586
+SUP_ARCH   = x86_64
 PROG       = dnsdist
 PAK_VER    = 8
 
diff --git a/lfs/libxml2 b/lfs/libxml2
index e3488f054..fd4b5e577 100644
--- a/lfs/libxml2
+++ b/lfs/libxml2
@@ -73,7 +73,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static --with-history
+	cd $(DIR_APP) && ./configure 		\
+			--prefix=/usr 		\
+			--disable-static 	\
+			--with-history		\
+			--without-python
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/libxslt b/lfs/libxslt
index 86ebee30e..159956b1a 100644
--- a/lfs/libxslt
+++ b/lfs/libxslt
@@ -71,7 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && ./configure 		\
+			--prefix=/usr		\
+			--disable-static	\
+			--without-python
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-05-12 10:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-12 10:39 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bf882cc8085caa99aedb2c6b46eb6d567063dd09 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox