Merge branch 'next'

[ipfire-2.x.git] / lfs / libcdada

diff --git a/lfs/python-six b/lfs/libcdada
similarity index 85%
rename from lfs/python-six
rename to lfs/libcdada
index 3383e6d0d34113a1cd56eeee3da09f64cafc2cbf..7a7b208ef30eaa81e957539fbecbe63a918af85c 100644 (file)
--- a/lfs/python-six
+++ b/lfs/libcdada
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2019  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,17 +24,17 @@
 
 include Config
 
-VER        = 1.10.0
+VER        = 0.3.4
 
-THISAPP    = six-$(VER)
+THISAPP    = libcdada-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = python-six
+PROG       = libcdada
 PAK_VER    = 1
 
-DEPS       =
+DEPS       = 
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 34eed507548117b2ab523ab14b2f8b55
+$(DL_FILE)_MD5 = f5067835014e02d221af9754df8b140b
 
 install : $(TARGET)
 
@@ -77,6 +77,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && python setup.py install
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch
+       cd $(DIR_APP) && ./autogen.sh
+       cd $(DIR_APP)/build && ../configure                     \
+                                       --prefix=/usr           \
+                                       --disable-static
+       cd $(DIR_APP)/build && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)