Revision: 7011
http://ipcop.svn.sourceforge.net/ipcop/?rev=7011&view=rev
Author: gespinasse
Date: 2013-04-21 23:16:05 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
Upgrade mklibs to 0.1.35
mklibs is very debian-centric, so we have to hack for the missing dpkg-*
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/mklibs
ipcop/trunk/lfs/mklibs
Added Paths:
-----------
ipcop/trunk/src/patches/mklibs-0.1.35_compile.patch
Modified: ipcop/trunk/config/rootfiles/common/mklibs
===================================================================
--- ipcop/trunk/config/rootfiles/common/mklibs 2013-04-21 23:06:36 UTC (rev
7010)
+++ ipcop/trunk/config/rootfiles/common/mklibs 2013-04-21 23:16:05 UTC (rev
7011)
@@ -1,3 +1,4 @@
+#usr/bin/dpkg-architecture
#usr/bin/mklibs
#usr/bin/mklibs-copy
#usr/bin/mklibs-readelf
Modified: ipcop/trunk/lfs/mklibs
===================================================================
--- ipcop/trunk/lfs/mklibs 2013-04-21 23:06:36 UTC (rev 7010)
+++ ipcop/trunk/lfs/mklibs 2013-04-21 23:16:05 UTC (rev 7011)
@@ -33,18 +33,18 @@
include Config
PKG_NAME = mklibs
-VER = 0.1.30
+VER = 0.1.35
HOST_ARCH = all
OTHER_SRC = yes
-THISAPP = $(PKG_NAME)_$(VER)
-DL_FILE = $(THISAPP).tar.gz
+THISAPP = $(PKG_NAME)-$(VER)
+DL_FILE = $(PKG_NAME)_$(VER).tar.gz
DL_FROM = $(URL_DEBIAN)/m/$(PKG_NAME)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-CFLAGS =
-CXXFLAGS =
+CXXFLAGS += -Wall
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 15d20c45f786126e31aa3ac06fc08da5
+$(DL_FILE)_MD5 = 3d2a4bd0bbf5ba964b0a1ecdafd1ea9a
install : $(TARGET)
@@ -83,11 +83,17 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ # openwrt borrowed, mklibs is totally debian-centric and we do not have
dpkg-parsechangelog
+ cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_compile.patch
+ # Put AC_CANONICAL_TARGET before AM_INIT_AUTOMAKE to silent warnings
+ cd $(DIR_APP) && sed -i -e 's/AC_CANONICAL_TARGET//' -e
's/AM_INIT_AUTOMAKE/AC_CANONICAL_TARGET\n&/' configure.ac
+ cd $(DIR_APP) && autoreconf -vif
- cd $(DIR_SRC) && mv $(PKG_NAME)* $(THISAPP)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install
+ # Python code think dpkg-architecture is always there, linking to true
add another / in path to default libs
+ ln -sf /bin/false /usr/bin/dpkg-architecture
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Added: ipcop/trunk/src/patches/mklibs-0.1.35_compile.patch
===================================================================
--- ipcop/trunk/src/patches/mklibs-0.1.35_compile.patch
(rev 0)
+++ ipcop/trunk/src/patches/mklibs-0.1.35_compile.patch 2013-04-21 23:16:05 UTC
(rev 7011)
@@ -0,0 +1,8 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([mklibs],m4_esyscmd(dpkg-parsechangelog | perl -ne 'print $1 if
m/^Version: (.*)$/;'))
++AC_INIT([mklibs],m4_esyscmd([head -n1 debian/changelog | awk -F'[\\\\(\\\\)]'
'{ print $2 }' | xargs -I{} echo -n {}]))
+ AM_INIT_AUTOMAKE([foreign no-define])
+ AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
