X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flibsolv;h=3cad11da7fb6f88ec226926f958ae32c816c3986;hp=b602095caa894e18d7e733d1b316017034f580d2;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=d4c35e45f81c5e1ad48108b469062eb94cb1657f

diff --git a/lfs/libsolv b/lfs/libsolv
index b602095caa..3cad11da7f 100644
--- a/lfs/libsolv
+++ b/lfs/libsolv
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.0.0-0db9d7f
+VER        = 0.0.0-c02d759
 
 THISAPP    = libsolv-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = libsolv
 DEPS       = ""
-PAK_VER    = 1
+PAK_VER    = 2
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ba95c404d807bc71297c508a7127a3d9
+$(DL_FILE)_MD5 = a8ba49ca49c309d61836fe78b0e0f83a
 
 install : $(TARGET)
 
@@ -86,26 +86,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt
 	cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt
 
-	# Make sure that libsatsolverext is linked properly to all needed
-	# libraries.
-	cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \
-		>> ext/CMakeLists.txt
-
-	# Remove the RPM stuff when we build with -DFEDORA=1 because we
-	# do not support RPM.
-	cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt
-
-	# Our version of glibc has no __qsort_r
-	cd $(DIR_APP) && echo "#define USE_OWN_QSORT" >> src/util.h
-
 	cd $(DIR_APP) && mkdir build
-	cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \
+	cd $(DIR_APP)/build && cmake .. \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=1
+		-DCMAKE_SKIP_RPATH=1 \
+		-DENABLE_PERL=0 \
+		-DENABLE_PYTHON=0 \
+		-DENABLE_RUBY=0
 	cd $(DIR_APP)/build && make $(PARALELLISMFLAGS)
-
 	cd $(DIR_APP)/build && make install
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)