fix vsftpd compile error (#1409)

[openwrt/svn-archive/archive.git] / libs / glib / Makefile

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index 82691af6176f7b5619eb2ff542346de55040007e..e73287b6690271c180097d6de0ddc93fc081ca91 100644 (file)
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -12,7 +12,6 @@ PKG_NAME:=glib
 PKG_VERSION:=1.2.10
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
        http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \
@@ -21,84 +20,54 @@ PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
 PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libglib1
+define Package/glib1
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=The GLib library of C routines
-  DESCRIPTION:=The GLib library of C routines.\\\
-    GLib is a library containing many useful C routines for things such \\\
-    as trees, hashes, and lists.
+  DESCRIPTION:=\
+       GLib is a library containing many useful C routines for things such \\\
+       as trees, hashes, and lists.
   URL:=http://www.gtk.org/
 endef
 
+# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
+PKG_CONFIGURE_VARS:=\
+       glib_cv_prog_cc_ansi_proto=no \
+       glib_cv_has__inline=yes \
+       glib_cv_has__inline__=yes \
+       glib_cv_hasinline=yes \
+       glib_cv_sane_realloc=yes \
+       glib_cv_va_copy=no \
+       glib_cv___va_copy=yes \
+       glib_cv_va_val_copy=yes \
+       glib_cv_rtldglobal_broken=no \
+       glib_cv_uscore=no \
+       glib_cv_func_pthread_mutex_trylock_posix=yes \
+       glib_cv_func_pthread_cond_timedwait_posix=yes \
+       glib_cv_sizeof_gmutex=24 \
+       glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
+
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               glib_cv_sizeof_gmutex=24 \
-               ac_cv_sizeof_char=1 \
-               ac_cv_sizeof_short=2 \
-               ac_cv_sizeof_int=4 \
-               ac_cv_sizeof_long=4 \
-               ac_cv_sizeof_long_long=8 \
-               ac_cv_sizeof_void_p=4 \
-               glib_cv_prog_cc_ansi_proto="no" \
-               glib_cv_has__inline="yes" \
-               glib_cv_has__inline__="yes" \
-               glib_cv_hasinline="yes" \
-               glib_cv_sane_realloc="yes" \
-               glib_cv_va_copy="no" \
-               glib_cv___va_copy="yes" \
-               glib_cv_va_val_copy="yes" \
-               glib_cv_rtldglobal_broken="no" \
-               glib_cv_uscore="no" \
-               ac_cv_func_getpwuid_r="yes" \
-               glib_cv_func_pthread_mutex_trylock_posix="yes" \
-               glib_cv_func_pthread_cond_timedwait_posix="yes" \
-               glib_cv_sizeof_gmutex="24" \
-               glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --sbindir=/usr/sbin \
-                       --libexecdir=/usr/lib \
-                       --sysconfdir=/etc \
-                       --datadir=/usr/share \
-                       --localstatedir=/var \
-                       --mandir=/usr/man \
-                       --infodir=/usr/info \
-                       $(DISABLE_NLS) \
-                       $(DISABLE_LARGEFILE) \
-                       --enable-shared=yes \
-                       --enable-static=yes \
-       );
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               , \
+               $(PKG_CONFIGURE_VARS) \
+       )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install
 endef
 
-define Package/libglib1/install
-       install -m0755 -d $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
@@ -123,4 +92,9 @@ define Build/UninstallDev
                $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
 endef
 
-$(eval $(call BuildPackage,libglib1))
+define Package/glib1/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,glib1))