Revert "python-six: Removal of python2 & 3 addon versions of six"

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

diff --git a/lfs/glib b/lfs/glib
index 1b43287ac31a5f20dcde592e215f88459b078f84..522c542581aff38b227e046f23226e5a9840b81a 100644 (file)
--- a/lfs/glib
+++ b/lfs/glib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# 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        = 2.32.3
+VER        = 2.68.3
 
 THISAPP    = glib-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9bd3ac535c24b6c162be13b2c43c5adc
+$(DL_FILE)_MD5 = a3968c7510447f055fd2204ba947f80f
 
 install : $(TARGET)
 
@@ -70,9 +70,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-               --with-pcre=system
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
+       $(UPDATE_AUTOMAKE)
+       cd $(DIR_APP) && meson  --prefix=/usr           \
+                               --sysconfdir=/etc       \
+                               -D internal_pcre=false  \
+                               builddir/
+       cd $(DIR_APP) && ninja -C builddir/
+       cd $(DIR_APP) && ninja -C builddir/ install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)