Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

[people/teissler/ipfire-2.x.git] / lfs / libsatsolver

diff --git a/lfs/libsatsolver b/lfs/libsatsolver
index 619c4778cff67950dcc77fc85df64d0523454059..bdae27151735488f76c799fe27df3f7d00e1dcfd 100644 (file)
--- a/lfs/libsatsolver
+++ b/lfs/libsatsolver
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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,14 +24,18 @@
 
 include Config
 
-VER        = 0.16.4
+VER        = 0.16.4-c57e9df
 
 THISAPP    = libsatsolver-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+PROG       = libsatsolver
+DEPS       = ""
+PAK_VER    = 2
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 563414330c29e9b49be0e43358185a78
+$(DL_FILE)_MD5 = 756cae7df92fd3faa0a49883378d8c98
 
 install : $(TARGET)
 
@@ -50,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist : 
+       @$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -69,9 +76,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Build-only-libraries.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch
 
        # Who releases code with -Werror?
@@ -86,6 +92,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # 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 \
                -DCMAKE_INSTALL_PREFIX=/usr \