projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[packages] tor: update to 0.2.1.29 (CVE-2011-0427)
[openwrt/svn-archive/archive.git]
/
libs
/
glib
/
Makefile
diff --git
a/libs/glib/Makefile
b/libs/glib/Makefile
index 90f7009d5674eeca9c16956bb65ed33ea266c5ea..7b7018036d57fd8ea44ac459ae8a7c42e66963d0 100644
(file)
--- a/
libs/glib/Makefile
+++ b/
libs/glib/Makefile
@@
-4,7
+4,6
@@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
include $(TOPDIR)/rules.mk
@@
-19,6
+18,9
@@
PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/glib1
include $(INCLUDE_DIR)/package.mk
define Package/glib1
@@
-34,6
+36,9
@@
define Package/glib1/description
as trees, hashes, and lists.
endef
as trees, hashes, and lists.
endef
+TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
+
CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
@@
-54,35
+59,17
@@
CONFIGURE_VARS += \
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" \
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
- $(call Build/Configure/Default)
- $(call libtool_disable_rpath)
-endef
-
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) all
- $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
- $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-endef
-
define Build/InstallDev
define Build/InstallDev
+ $(INSTALL_DIR) $(1) $(2)/bin
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(CP) $(PKG_BUILD_DIR)/.libs/*.a $(PKG_BUILD_DIR)/*/.libs/*.a $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(CP) $(PKG_BUILD_DIR)/.libs/*.a $(PKG_BUILD_DIR)/*/.libs/*.a $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/
- $(SED) 's,-I$$$${prefix}/include/glib,-I$(1)/usr/include/glib,g' $(1)/usr/bin/glib-config
- $(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(1)/usr/lib/glib,g' $(1)/usr/bin/glib-config
+ ln -sf $(STAGING_DIR)/usr/bin/glib-config $(2)/bin/
+ $(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(1)/usr/bin/glib-config
+ $(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(1)/usr/bin/glib-config
$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/glib-config
endef
$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/glib-config
endef
-define Build/UninstallDev
- rm -rf $(STAGING_DIR)/usr/bin/glib-config \
- $(STAGING_DIR)/usr/include/glib-1.2 \
- $(STAGING_DIR)/usr/lib/libg{lib,module,thread}.{a,so} \
- $(STAGING_DIR)/usr/lib/libg{lib,module,thread}-*.so.* \
- $(STAGING_DIR)/usr/lib/glib \
- $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
-endef
-
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/
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/