[packages/rpm] - remove superfluous -lexpat option during lua building

draenog draenog at pld-linux.org
Mon Sep 23 20:57:01 CEST 2013


commit 5666ceedc5dd84d4a83bc4a83c4040b029fdd667
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Mon Sep 23 19:55:37 2013 +0100

    - remove superfluous -lexpat option during lua building

 rpm-lua-expat.patch | 14 ++++++++++++++
 rpm.spec            |  2 ++
 2 files changed, 16 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 7983ca9..b46091b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -157,6 +157,7 @@ Patch73:	gem_helper-spec-arg.patch
 Patch74:	rpm-fix-internal-lua-build.patch
 Patch75:	rpm-double_check_file_deps.patch
 Patch76:	rpm-revert-debugedit-breakage.patch
+Patch77:	%{name}-lua-expat.patch
 
 # Patches imported from Mandriva
 
@@ -902,6 +903,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch74 -p1
 %patch75 -p1
 %patch76 -p0
+%patch77 -p0
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-lua-expat.patch b/rpm-lua-expat.patch
new file mode 100644
index 0000000..a3ac839
--- /dev/null
+++ b/rpm-lua-expat.patch
@@ -0,0 +1,14 @@
+--- lua/Makefile.am~	2013-06-29 22:03:22.000000000 +0100
++++ lua/Makefile.am	2013-09-23 19:07:35.157853272 +0100
+@@ -230,7 +230,10 @@
+ #	local/lwrs.h
+ #	local/lwrs.c
+ 
+-liblua_la_LIBADD = @WITH_LUA_SUBDIR_LIB@ -lm -lexpat
++liblua_la_LIBADD = @WITH_LUA_SUBDIR_LIB@ -lm
++if USE_LUA_CRYPTO
++liblua_la_LIBADD += -lexpat
++endif
+ liblua_la_SOURCES += \
+ 	local/llocal.c \
+ 	local/llocal.h \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/5666ceedc5dd84d4a83bc4a83c4040b029fdd667



More information about the pld-cvs-commit mailing list