Merge commit 'origin/master' into next

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

diff --git a/lfs/libsatsolver b/lfs/libsatsolver
index 619c4778cff67950dcc77fc85df64d0523454059..778375a2e64c70af7fb20f0160fac0ce6f2e6e04 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        #
@@ -32,6 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+PROG       = libsatsolver
+DEPS       = ""
+PAK_VER    = 1
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -50,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist : 
+       @$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -86,6 +93,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 \