X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpkg-config;h=567892084be2b19ef23ee8e2ec2d47dbd7c38724;hb=5996c2815798e7bb8c069caad40ffb084ecf1cf7;hp=d58fbe2abad47e33a7246af043cc67199ce85a6b;hpb=9c59597ba49c3bcec23bc5397eb203cddc38cc35;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/pkg-config b/lfs/pkg-config
index d58fbe2aba..567892084b 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2016  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.29.1
+VER        = 0.29.2
 
 THISAPP    = pkg-config-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,18 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  PREFIX = /usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  PREFIX = /tools
 endif
 
-CFLAGS += Wno-error=format-nonliteral
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -52,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f739a28cae4e0ca291f82d1d41ef107d
+$(DL_FILE)_MD5 = f6e931e319531b736fadc017f470e68a
 
 install : $(TARGET)
 
@@ -82,13 +78,14 @@ $(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)/glib && patch -Np1 < $(DIR_SRC)/src/patches/pkg-config-0.29-glib-compile-fix.patch
-ifeq "$(ROOT)" ""
-else
-	mkdir -pv /tools/lib/pkgconfig
-endif
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+ifeq "$(TOOLCHAIN)" "1"
+	mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)