clean up some packages

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12513 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2008-09-03 13:21:20 +00:00
parent d34595e3e8
commit ba7d27e01e
5 changed files with 38 additions and 33 deletions

View File

@ -17,8 +17,17 @@ PKG_MD5SUM:=2c633a06c140024dd0d59db1e87e6945
include $(INCLUDE_DIR)/package.mk
EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
PKG_INSTALL=1
TARGET_CFLAGS += $(FPIC) \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
CONFIGURE_VARS += PYTHON=/usr/bin/python
define Package/gst-python
SUBMENU:=Python
@ -33,22 +42,6 @@ define Package/gst-python/description
python bindings for dbus
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); \
if [ -x $(CONFIGURE_CMD) ]; then \
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
$(CONFIGURE_VARS) \
PYTHON=/usr/bin/python \
$(CONFIGURE_CMD) \
$(CONFIGURE_ARGS) ;\
fi \
)
endef
define Build/Compile
cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
endef
define Build/InstallDev
mkdir -p $(1)
cp -r $(PKG_INSTALL_DIR)/* $(1)

View File

@ -16,8 +16,13 @@ PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
EXTRA_CFLAGS += \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include
EXTRA_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
define Package/dbus-python
SUBMENU:=Python

View File

@ -16,8 +16,13 @@ PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
EXTRA_CFLAGS += \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include
EXTRA_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
define Package/gnome-python-desktop
SUBMENU:=Python

View File

@ -16,8 +16,15 @@ PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/ -fPIC
EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
PKG_INSTALL = 1
TARGET_CFLAGS += $(FPIC) \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
define Package/check
SECTION:=lib
@ -28,7 +35,7 @@ define Package/check
endef
define Package/check/description
unit testinglibrary
unit testing library
endef
define Build/Configure
@ -36,10 +43,8 @@ define Build/Configure
$(call Build/Configure/Default)
endef
TARGET_CFLAGS += $(FPIC)
define Build/Compile
cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
define Build/Install
$(call Build/Install/Default)
cd $(PKG_INSTALL_DIR)/usr/lib/ ; ln -s libcheck.so libcheck_pic.so
endef

View File

@ -34,10 +34,7 @@ define Package/ssmtp/description
configuration.
endef
EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
TARGET_CONFIGURE_OPTS+=\
TARGET_CONFIGURE_OPTS += \
CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)"
CONFIGURE_ARGS += \