bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] make libintl and libiconv stub/full implementations switchable, use the new include/nls.mk infrastructure for it

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@25319 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-02-02 18:54:24 +00:00
parent c6e2eec288
commit d3a7097b71
65 changed files with 189 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Xorg/app/dillo/Makefile
View File

@ -20,6 +20,7 @@ PKG_SOURCE_URL:=http://hg.dillo.org/dillo
PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/dillo define Package/dillo
SECTION:=xorg-app SECTION:=xorg-app
@ -27,7 +28,7 @@ define Package/dillo
SUBMENU:=app SUBMENU:=app
TITLE:=Dillo2 TITLE:=Dillo2
URL:=http://fltk.org/ URL:=http://fltk.org/
DEPENDS:=+libXft +libstdcpp +libpthread +zlib +fltk2 +libjpeg +libiconv +libpng DEPENDS:=+libXft +libstdcpp +libpthread +zlib +fltk2 +libjpeg +libpng $(ICONV_DEPENDS)
endef endef
define Package/dillo/description define Package/dillo/description
@ -39,8 +40,8 @@ define Package/dillo/description
Note: This is the fltk2 based dillo. Note: This is the fltk2 based dillo.
endef endef
EXTRA_CPPFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include EXTRA_CPPFLAGS+=-I$(ICONV_PREFIX)/include
EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib EXTRA_LDFLAGS+=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Build/Configure define Build/Configure
(cd $(PKG_BUILD_DIR); ./autogen.sh ); (cd $(PKG_BUILD_DIR); ./autogen.sh );

7
Xorg/app/eterm/Makefile
View File

@ -20,6 +20,7 @@ PKG_MD5SUM:=b8869ee9c9b9516231af9eefa595cee3
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/eterm/Default define Package/eterm/Default
SECTION:=xorg-extra SECTION:=xorg-extra
@ -31,7 +32,7 @@ endef
define Package/eterm define Package/eterm
$(call Package/eterm/Default) $(call Package/eterm/Default)
TITLE:=eterm TITLE:=eterm
DEPENDS:=+libX11 +libXcursor +imlib2 +libast +libiconv DEPENDS:=+libX11 +libXcursor +imlib2 +libast $(ICONV_DEPENDS)
endef endef
define Package/esetroot define Package/esetroot
@ -48,8 +49,8 @@ CONFIGURE_VARS += \
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)\ $(MAKE) -C $(PKG_BUILD_DIR)\
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libiconv/include/" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(ICONV_PREFIX)/include/" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib/" LDFLAGS="$(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib/"
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
endef endef

6
Xorg/app/gtkperf/Makefile
View File

@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_LDFLAGS+=\ TARGET_LDFLAGS+=\
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
@ -33,11 +34,6 @@ define Package/gtkperf
URL:=http://gtkperf.sourceforge.net URL:=http://gtkperf.sourceforge.net
endef endef
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libintl/lib/
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include/
TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib/
define Package/gtkperf/install define Package/gtkperf/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) \ $(INSTALL_BIN) \

3
Xorg/app/xine-ui/Makefile
View File

@ -19,6 +19,7 @@ PKG_MD5SUM:=90ea1f76747e9788a30a73e7f4a76cf6
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
EXTRA_LDLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib EXTRA_LDLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
@ -27,7 +28,7 @@ define Package/xine-ui
CATEGORY:=Xorg CATEGORY:=Xorg
SUBMENU:=app SUBMENU:=app
TITLE:=xine user interface TITLE:=xine user interface
DEPENDS:=+xine-lib +libpng +curl +libiconv +libXv +libXt +libICE +libXxf86vm +libpng +libfreetype DEPENDS:=+xine-lib +libpng +curl +libXv +libXt +libICE +libXxf86vm +libpng +libfreetype $(ICONV_DEPENDS)
URL:=http://www.xine-project.org/ URL:=http://www.xine-project.org/
endef endef

5
Xorg/lib/atk/Makefile
View File

@ -21,10 +21,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
define Package/atk define Package/atk
SECTION:=xorg-libraries SECTION:=xorg-libraries

1
Xorg/lib/gtk2/Makefile
View File

@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_LDFLAGS+=\ TARGET_LDFLAGS+=\
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib

9
Xorg/lib/gtkmm/Makefile
View File

@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS+=\
-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-I$(STAGING_DIR)/usr/lib/libiconv/include/
TARGET_LDFLAGS+=\ TARGET_LDFLAGS+=\
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/
define Package/gtkmm define Package/gtkmm
SECTION:=xorg-framework SECTION:=xorg-framework

3
Xorg/lib/hippo-canvas/Makefile
View File

@ -17,12 +17,13 @@ PKG_MD5SUM:=9a0f64eb0258a3e8ba710eff9798a7d0
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk) -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
PKG_INSTALL:=1 PKG_INSTALL:=1
EXTRA_CFLAGS += \ EXTRA_CFLAGS += \
-I$(STAGING_DIR)/usr/lib/libintl/include \ -I$(INTL_PREFIX)/include \
-I$(STAGING_DIR)/usr/include/libcroco-0.6 \ -I$(STAGING_DIR)/usr/include/libcroco-0.6 \
STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_hippo-canvas CONFIG_PACKAGE_python-hippo-canvas) STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_hippo-canvas CONFIG_PACKAGE_python-hippo-canvas)

5
Xorg/lib/librsvg/Makefile
View File

@ -17,12 +17,13 @@ PKG_MD5SUM:=c4ec4fdb2b1842e221ca39127e85682d
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
PKG_INSTALL=1 PKG_INSTALL=1
EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \ -L$(ICONV_PREFIX)/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(INTL_PREFIX)/lib/
STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_librsvg CONFIG_PACKAGE_librsvg-pixbuf-loader) STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_librsvg CONFIG_PACKAGE_librsvg-pixbuf-loader)

5
Xorg/lib/pango/Makefile
View File

@ -21,11 +21,10 @@ PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=0 PKG_BUILD_PARALLEL:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib
define Package/pango define Package/pango
SECTION:=xorg-libraries SECTION:=xorg-libraries

9
Xorg/lib/pangomm/Makefile
View File

@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS+=\
-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-I$(STAGING_DIR)/usr/lib/libiconv/include/
TARGET_LDFLAGS+=\ TARGET_LDFLAGS+=\
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/
define Package/pangomm define Package/pangomm
SECTION:=xorg-libraries SECTION:=xorg-libraries

7
Xorg/lib/vte/Makefile
View File

@ -19,16 +19,17 @@ PKG_FIXUP:=libtool
PKG_BUILD_DEPENDS:=intltool/host PKG_BUILD_DEPENDS:=intltool/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
$(call include_mk, python-package.mk) $(call include_mk, python-package.mk)
PKG_INSTALL=1 PKG_INSTALL=1
EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include EXTRA_CFLAGS+=-I$(INTL_PREFIX)/include
EXTRA_LDFLAGS+= \ EXTRA_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib \ -L$(ICONV_PREFIX)/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(INTL_PREFIX)/lib
STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_vte CONFIG_PACKAGE_python-vte) STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_vte CONFIG_PACKAGE_python-vte)

11
Xorg/lib/wnck/Makefile
View File

@ -20,15 +20,10 @@ PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=intltool/host PKG_BUILD_DEPENDS:=intltool/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS+= \ TARGET_CFLAGS+=$(FPIC)
-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-I$(STAGING_DIR)/usr/lib/libiconv/include/ \
$(FPIC)
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-Wl,-rpath=/usr/lib -Wl,-rpath=/usr/lib
@ -38,7 +33,7 @@ define Package/libwnck
SUBMENU:=libraries SUBMENU:=libraries
TITLE:=Window Navigator Construction Kit TITLE:=Window Navigator Construction Kit
URL:=http://ftp.gnome.org/ URL:=http://ftp.gnome.org/
DEPENDS:=+libX11 +gtk2 +glib2 +libXext +libintl DEPENDS:=+libX11 +gtk2 +glib2 +libXext $(INTL_DEPENDS)
endef endef
define Package/libwnck/description define Package/libwnck/description

7
Xorg/wm/matchbox-window-manager/Makefile
View File

@ -19,12 +19,11 @@ PKG_MD5SUM:=3e158dcf57823b55c926d95b245500fb
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libiconv/lib \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libintl/lib
include $(INCLUDE_DIR)/package.mk
define Package/matchbox-window-manager define Package/matchbox-window-manager
TITLE:=matchbox window manager TITLE:=matchbox window manager

5
admin/syslog-ng3/Makefile
View File

@ -19,6 +19,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_IPV6 \ CONFIG_IPV6 \
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/syslog-ng3 define Package/syslog-ng3
SECTION:=admin SECTION:=admin
@ -56,10 +57,6 @@ CONFIGURE_ARGS += \
TARGET_CPPFLAGS += \ TARGET_CPPFLAGS += \
-I$(STAGING_DIR)/usr/include/eventlog -I$(STAGING_DIR)/usr/include/eventlog
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
CONFIGURE_VARS += \ CONFIGURE_VARS += \
LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include" LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include"

10
lang/gst-python/Makefile
View File

@ -17,17 +17,11 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
$(call include_mk, python-package.mk) $(call include_mk, python-package.mk)
TARGET_CFLAGS += $(FPIC) \ 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=$(HOST_PYTHON) CONFIGURE_VARS += PYTHON=$(HOST_PYTHON)
define Package/gst-python define Package/gst-python

11
lang/php5/Makefile
View File

@ -19,6 +19,7 @@ PKG_FIXUP:=libtool no-autoreconf
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/php5/Default define Package/php5/Default
SUBMENU:=PHP SUBMENU:=PHP
@ -182,7 +183,7 @@ endef
define Package/php5-mod-iconv define Package/php5-mod-iconv
$(call Package/php5/Default) $(call Package/php5/Default)
DEPENDS:=php5 +libiconv DEPENDS:=php5 $(ICONV_DEPENDS)
TITLE:=iConv shared module TITLE:=iConv shared module
endef endef
define Package/php5-mod-iconv/config define Package/php5-mod-iconv/config
@ -350,7 +351,7 @@ endef
define Package/php5-mod-xmlreader define Package/php5-mod-xmlreader
$(call Package/php5/Default) $(call Package/php5/Default)
DEPENDS:=php5 +libxml2 +libiconv DEPENDS:=php5 +libxml2 $(ICONV_DEPENDS)
TITLE:=XMLReader shared module TITLE:=XMLReader shared module
endef endef
define Package/php5-mod-xmlreader/config define Package/php5-mod-xmlreader/config
@ -360,7 +361,7 @@ endef
define Package/php5-mod-xmlwriter define Package/php5-mod-xmlwriter
$(call Package/php5/Default) $(call Package/php5/Default)
DEPENDS:=php5 +libxml2 +libiconv DEPENDS:=php5 +libxml2 $(ICONV_DEPENDS)
TITLE:=XMLWriter shared module TITLE:=XMLWriter shared module
endef endef
define Package/php5-mod-xmlwriter/config define Package/php5-mod-xmlwriter/config
@ -390,7 +391,7 @@ PKG_CONFIGURE_OPTS:= \
--disable-phar --disable-phar
ifneq ($(SDK),) ifneq ($(SDK),)
PKG_BUILD_DEPENDS+=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libpthread libsqlite3 libpcre libxml2 libiconv PKG_BUILD_DEPENDS+=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libpthread libsqlite3 libpcre libxml2
# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK # force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK
CONFIG_PACKAGE_php5-cli:=m CONFIG_PACKAGE_php5-cli:=m
CONFIG_PACKAGE_php5-cgi:=m CONFIG_PACKAGE_php5-cgi:=m
@ -469,7 +470,7 @@ else
endif endif
ifneq ($(CONFIG_PACKAGE_php5-mod-iconv),) ifneq ($(CONFIG_PACKAGE_php5-mod-iconv),)
PKG_CONFIGURE_OPTS+= --with-iconv=shared,"$(STAGING_DIR)/usr" PKG_CONFIGURE_OPTS+= --with-iconv=shared,"$(ICONV_PREFIX)"
else else
PKG_CONFIGURE_OPTS+= --without-iconv PKG_CONFIGURE_OPTS+= --without-iconv
endif endif

4
lang/pygobject/Makefile
View File

@ -18,11 +18,11 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
$(call include_mk, python-package.mk) $(call include_mk, python-package.mk)
EXTRA_LDFLAGS+= \ EXTRA_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \ -L$(ICONV_PREFIX) -L$(INTL_PREFIX)
-L$(STAGING_DIR)/usr/lib/libiconv/lib/
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += --enable-static CONFIGURE_ARGS += --enable-static

9
lang/pygtk/Makefile
View File

@ -17,16 +17,9 @@ PKG_MD5SUM:=a816346d750d61e3fa67a200e4292694
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
$(call include_mk, python-package.mk) $(call include_mk, python-package.mk)
TARGET_CFLAGS+= \
-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/python-gtk define Package/python-gtk
SUBMENU:=Python SUBMENU:=Python
SECTION:=lang SECTION:=lang

9
lang/python-dbus/Makefile
View File

@ -19,17 +19,12 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
$(call include_mk, python-package.mk) $(call include_mk, python-package.mk)
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include
TARGET_LDFLAGS += \ TARGET_LDFLAGS += \
-Wl,-rpath=$(STAGING_DIR)/usr/lib \ -Wl,-rpath=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
define Package/dbus-python define Package/dbus-python
SUBMENU:=Python SUBMENU:=Python

13
lang/python-gnome-desktop2/Makefile
View File

@ -15,18 +15,17 @@ PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22
PKG_MD5SUM:=504877a973f6abc0788283232cd703cb PKG_MD5SUM:=504877a973f6abc0788283232cd703cb
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
# AM_PATH_GTK_2_0
PKG_BUILD_DEPENDS:=gtk2
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
$(call include_mk, python-package.mk) $(call include_mk, python-package.mk)
PKG_INSTALL=1 PKG_INSTALL=1
EXTRA_CFLAGS += \ EXTRA_CFLAGS += -I$(ICONV_PREFIX) -I$(INTL_PREFIX)
-I$(STAGING_DIR)/usr/lib/libintl/include \ EXTRA_LDFLAGS += -L$(ICONV_PREFIX) -L$(INTL_PREFIX)
-I$(STAGING_DIR)/usr/lib/libiconv/include \
EXTRA_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_python-rsvg CONFIG_PACKAGE_python-wnck) STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_python-rsvg CONFIG_PACKAGE_python-wnck)

3
lang/ruby/Makefile
View File

@ -30,6 +30,7 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/ruby/Default define Package/ruby/Default
SUBMENU:=Ruby SUBMENU:=Ruby
@ -208,7 +209,7 @@ CONFIGURE_ARGS += \
--enable-ipv6 \ --enable-ipv6 \
--enable-wide-getaddrinfo \ --enable-wide-getaddrinfo \
--with-ruby-version=minor \ --with-ruby-version=minor \
--with-iconv-dir=$(STAGING_DIR_ROOT)/../usr/lib/libiconv \ --with-iconv-dir=$(ICONV_PREFIX) \
TARGET_LDFLAGS += -L$(PKG_BUILD_DIR) TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)

7
libs/apr-util/Makefile
View File

@ -18,11 +18,12 @@ PKG_MD5SUM:=29dd557f7bd891fc2bfdffcfa081db59
PKG_FIXUP = libtool PKG_FIXUP = libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libaprutil define Package/libaprutil
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libapr +libexpat +libiconv +libpthread +libsqlite3 +libuuid DEPENDS:=+libapr +libexpat +libpthread +libsqlite3 +libuuid $(ICONV_DEPENDS)
TITLE:=Apache Portable Runtime Utility Library TITLE:=Apache Portable Runtime Utility Library
URL:=http://apr.apache.org/ URL:=http://apr.apache.org/
endef endef
@ -35,14 +36,14 @@ CONFIGURE_ARGS += \
--with-expat="$(STAGING_DIR)/usr" \ --with-expat="$(STAGING_DIR)/usr" \
--without-sqlite2 \ --without-sqlite2 \
--with-sqlite3="$(STAGING_DIR)/usr" \ --with-sqlite3="$(STAGING_DIR)/usr" \
--with-iconv="$(STAGING_DIR)/usr/lib/libiconv" \ --with-iconv="$(ICONV_PREFIX)" \
CONFIGURE_VARS += \ CONFIGURE_VARS += \
ac_cv_file_dbd_apr_dbd_mysql_c=no \ ac_cv_file_dbd_apr_dbd_mysql_c=no \
APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \ APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat -liconv -lapr-1 -luuid -lm -lcrypt" all $(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" all
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
endef endef

11
libs/dbus-glib/Makefile
View File

@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libdbus-glib define Package/libdbus-glib
@ -27,7 +28,7 @@ define Package/libdbus-glib
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=D-Bus Glib bindings TITLE:=D-Bus Glib bindings
URL:=http://dbus.freedesktop.org/doc/dbus-glib/ URL:=http://dbus.freedesktop.org/doc/dbus-glib/
DEPENDS:=+libdbus +glib2 +libiconv +libintl DEPENDS:=+libdbus +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
endef endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
@ -42,10 +43,10 @@ CONFIGURE_ARGS += \
CONFIGURE_VARS+= \ CONFIGURE_VARS+= \
ac_cv_func_posix_getpwnam_r="yes" \ ac_cv_func_posix_getpwnam_r="yes" \
ac_cv_have_abstract_sockets="yes" \ ac_cv_have_abstract_sockets="yes" \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \ CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \ CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \ LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libintl/lib" \ LDFLAGS="$$$$LDFLAGS -L$(INTL_PREFIX)/lib" \
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/dbus-1.0/dbus $(INSTALL_DIR) $(1)/usr/include/dbus-1.0/dbus

7
libs/gconf2/Makefile
View File

@ -12,18 +12,13 @@ PKG_MD5SUM:=4971d96f5ba94fe4a69396267bd5afe8
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
PKG_BUILD_DEPENDS:=orbit2/host intltool/host PKG_BUILD_DEPENDS:=orbit2/host intltool/host
PKG_INSTALL=1 PKG_INSTALL=1
TARGET_CFLAGS+= \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/libiconv/include
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Package/libgconf2 define Package/libgconf2

8
libs/gettext-full/Makefile
View File

@ -45,11 +45,11 @@ CONFIGURE_ARGS += \
--without-emacs --without-emacs
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/gettext-full/include $(INSTALL_DIR) $(1)/usr/lib/libintl-full/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/gettext-full/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl-full/include/
$(INSTALL_DIR) $(1)/usr/lib/gettext-full/lib $(INSTALL_DIR) $(1)/usr/lib/libintl-full/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/gettext-full/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl-full/lib/
$(INSTALL_DIR) $(1)/usr/share/aclocal $(INSTALL_DIR) $(1)/usr/share/aclocal
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/

4
libs/gettext/Makefile
View File

@ -30,8 +30,8 @@ define Build/Compile
endef endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib/libintl-stub/include
$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/libintl.h $(1)/usr/include/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/include/libintl.h $(1)/usr/lib/libintl-stub/include/
$(INSTALL_DIR) $(1)/usr/share/aclocal $(INSTALL_DIR) $(1)/usr/share/aclocal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/

13
libs/glib2/Makefile
View File

@ -24,11 +24,12 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/glib2 define Package/glib2
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libiconv +libintl DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
TITLE:=glib 2.0 TITLE:=glib 2.0
URL:=http://www.gtk.org/ URL:=http://www.gtk.org/
endef endef
@ -37,15 +38,6 @@ define Package/glib2/description
The GLib library of C routines The GLib library of C routines
endef endef
TARGET_CFLAGS+= \
$(FPIC) \
-I$(STAGING_DIR)/usr/lib/libiconv/include \
-I$(STAGING_DIR)/usr/lib/libintl/include
TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib
define Build/Configure define Build/Configure
$(call Build/Configure/Default, \ $(call Build/Configure/Default, \
--enable-shared \ --enable-shared \
@ -53,6 +45,7 @@ define Build/Configure
--enable-debug=no \ --enable-debug=no \
--disable-selinux \ --disable-selinux \
--disable-fam \ --disable-fam \
$(if $(ICONV_FULL),--with-libiconv=gnu) \
, \ , \
glib_cv_stack_grows=no \ glib_cv_stack_grows=no \
glib_cv_uscore=no \ glib_cv_uscore=no \

9
libs/glibmm/Makefile
View File

@ -19,6 +19,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/glibmm define Package/glibmm
SECTION:=libs SECTION:=libs
@ -32,14 +33,8 @@ define Package/glibmm/description
c++ bindings for glib2 c++ bindings for glib2
endef endef
TARGET_CFLAGS+= \
-I$(STAGING_DIR)/usr/lib/libiconv/include \
-I$(STAGING_DIR)/usr/lib/libintl/include
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib
CONFIGURE_ARGS+= --disable-fulldocs CONFIGURE_ARGS+= --disable-fulldocs

9
libs/libIDL2/Makefile
View File

@ -23,14 +23,7 @@ PKG_INSTALL=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/libiconv/include
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/
define Package/libIDL2 define Package/libIDL2
SECTION:=libs SECTION:=libs

4
libs/libcroco/Makefile
View File

@ -10,10 +10,10 @@ PKG_MD5SUM:=1429c597aa4b75fc610ab3a542c99209
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \ -L$(ICONV_PREFIX) -L$(INTL_PREFIX)
-L$(STAGING_DIR)/usr/lib/libiconv/lib/
define Package/libcroco define Package/libcroco
SECTION:=libs SECTION:=libs

7
libs/libdmapsharing/Makefile
View File

@ -23,13 +23,10 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS+= \
-I$(STAGING_DIR)/usr/lib/libintl/include
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libintl/lib
define Package/libdmapsharing define Package/libdmapsharing
SECTION:=libs SECTION:=libs

7
libs/libgphoto2/Makefile
View File

@ -20,6 +20,7 @@ PKG_LIBTOOL_PATHS:=. libgphoto2_port
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libgphoto2/Default define Package/libgphoto2/Default
SECTION:=libs SECTION:=libs
@ -29,7 +30,7 @@ endef
define Package/libgphoto2 define Package/libgphoto2
$(call Package/libgphoto2/Default) $(call Package/libgphoto2/Default)
DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl +libiconv DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl $(ICONV_DEPENDS)
TITLE:=The basic library of the gphoto2 program. TITLE:=The basic library of the gphoto2 program.
MENU:=1 MENU:=1
endef endef
@ -50,8 +51,8 @@ CONFIGURE_ARGS += \
--without-libintl-prefix \ --without-libintl-prefix \
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \ CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \ LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
LIBEXIF_CFLAGS="$$$$CPPFLAGS" \ LIBEXIF_CFLAGS="$$$$CPPFLAGS" \
LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \ LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
LIBUSB_CFLAGS="$$$$CPPFLAGS" \ LIBUSB_CFLAGS="$$$$CPPFLAGS" \

8
libs/libiconv/Makefile
View File

@ -35,11 +35,11 @@ define Build/Compile
endef endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib/libiconv-stub/lib
$(INSTALL_DATA) $(PKG_BUILD_DIR)/libiconv.a $(1)/usr/lib/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/libiconv.a $(1)/usr/lib/libiconv-stub/lib/
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib/libiconv-stub/include
$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/iconv.h $(1)/usr/include/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/include/iconv.h $(1)/usr/lib/libiconv-stub/include/
$(INSTALL_DIR) $(1)/usr/share/aclocal $(INSTALL_DIR) $(1)/usr/share/aclocal
$(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/

4
libs/libmms/Makefile
View File

@ -19,6 +19,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libmms define Package/libmms
SECTION:=libs SECTION:=libs
@ -36,9 +37,6 @@ define Package/libmms/description
endef endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
define Build/Configure define Build/Configure
(cd $(PKG_BUILD_DIR); ./autogen.sh ); (cd $(PKG_BUILD_DIR); ./autogen.sh );

4
libs/libmpd/Makefile
View File

@ -20,11 +20,9 @@ PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
define Package/libmpd define Package/libmpd
SECTION:=libs SECTION:=libs

9
libs/libsoup/Makefile
View File

@ -12,15 +12,10 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS+=\
-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-I$(STAGING_DIR)/usr/lib/libiconv/include/
TARGET_LDFLAGS+=\ TARGET_LDFLAGS+=\
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/
define Package/libsoup define Package/libsoup
SECTION:=libs SECTION:=libs

11
libs/libsynce/Makefile
View File

@ -16,13 +16,14 @@ PKG_SOURCE_URL:=@SF/synce
PKG_MD5SUM:=fd473d3deceda7912af4427dede1736f PKG_MD5SUM:=fd473d3deceda7912af4427dede1736f
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
PKG_BUILD_DEPENDS:=libiconv
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
define Package/libsynce define Package/libsynce
DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=SynCE library TITLE:=SynCE library
@ -44,10 +45,10 @@ CONFIGURE_ARGS += \
--enable-odccm-support=no --enable-odccm-support=no
CONFIGURE_VARS+= \ CONFIGURE_VARS+= \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \ CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \ CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \ LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libintl/lib" \ LDFLAGS="$$$$LDFLAGS -L$(INTL_PREFIX)/lib" \
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include

3
libs/libvncserver/Makefile
View File

@ -17,13 +17,14 @@ PKG_MD5SUM:=14af5bdae461df4666c18e5f83c150c4
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
PKG_INSTALL=1 PKG_INSTALL=1
define Package/libvncserver define Package/libvncserver
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+zlib +libiconv DEPENDS:=+zlib $(ICONV_DEPENDS)
TITLE:=VNC Server Library TITLE:=VNC Server Library
URL:=http://libvncserver.sourceforge.net/ URL:=http://libvncserver.sourceforge.net/
endef endef

5
libs/libxapian/Makefile
View File

@ -19,10 +19,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
define Package/libxapian define Package/libxapian
SECTION:=libs SECTION:=libs

9
libs/orbit2/Makefile
View File

@ -21,20 +21,13 @@ PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
PKG_INSTALL:=1 PKG_INSTALL:=1
HOST_BUILD_DEPENDS:=libIDL2/host HOST_BUILD_DEPENDS:=libIDL2/host
PKG_BUILD_DEPENDS:=orbit2/host PKG_BUILD_DEPENDS:=orbit2/host
TARGET_CFLAGS+= \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/libiconv/include
TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
BIGENDIAN=no BIGENDIAN=no
ifeq ($(CONFIG_BIG_ENDIAN),y) ifeq ($(CONFIG_BIG_ENDIAN),y)
BIGENDIAN:=yes BIGENDIAN:=yes

7
libs/vips/Makefile
View File

@ -17,6 +17,7 @@ PKG_MD5SUM:=852913223ce5dc115bc7088e7c9d1596
PKG_FIXUP = libtool PKG_FIXUP = libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
PKG_INSTALL=1 PKG_INSTALL=1
@ -29,18 +30,14 @@ define Package/vips
$(call Package/vips/Default) $(call Package/vips/Default)
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=Multimedia CATEGORY:=Multimedia
DEPENDS:=+libjpeg +libintl +glib2 +libxml2 +imagemagick +libfreetype DEPENDS:=+libjpeg +glib2 +libxml2 +imagemagick +libfreetype $(INTL_DEPENDS)
endef endef
define Package/vips/description define Package/vips/description
An image manipulation library. An image manipulation library.
endef endef
TARGET_CFLAGS+= \
-I$(STAGING_DIR)/usr/lib/libintl/include
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \

4
multimedia/gstreamer/Makefile
View File

@ -21,6 +21,7 @@ PKG_REMOVE_FILES:=autogen.sh aclocal.m4
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/gstreamer/Default define Package/gstreamer/Default
CATEGORY:=Multimedia CATEGORY:=Multimedia
@ -95,8 +96,7 @@ CONFIGURE_ARGS += \
EXTRA_LDFLAGS+= \ EXTRA_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib \ -L$(ICONV_PREFIX)/lib -L$(INTL_PREFIX)/lib
-L$(STAGING_DIR)/usr/lib/libiconv/lib
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION) $(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)

7
multimedia/kissdx/Makefile
View File

@ -18,11 +18,12 @@ PKG_MD5SUM:=ef213d2748f5a63b1c97ac7bfa942b2f
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/kissdx define Package/kissdx
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=Multimedia CATEGORY:=Multimedia
DEPENDS:=+libjpeg +libiconv +libdvdread DEPENDS:=+libjpeg +libdvdread $(ICONV_DEPENDS)
TITLE:=PC-Link clone for KiSS media players TITLE:=PC-Link clone for KiSS media players
URL:=http://kissdx.vidartysse.net URL:=http://kissdx.vidartysse.net
endef endef
@ -35,8 +36,8 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib" \ CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(ICONV_PREFIX)/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib/libiconv/lib $(TARGET_LDFLAGS)" \ LDFLAGS="-L$(ICONV_PREFIX)/lib $(TARGET_LDFLAGS)" \
STRIP=$(STRIP) \ STRIP=$(STRIP) \
CC="$(TARGET_CROSS)gcc" all CC="$(TARGET_CROSS)gcc" all
endef endef

6
multimedia/minidlna/Makefile
View File

@ -19,14 +19,16 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/minidlna
PKG_BUILD_PARALLEL:=0 PKG_BUILD_PARALLEL:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/minidlna define Package/minidlna
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=Multimedia CATEGORY:=Multimedia
TITLE:=UPnP A/V & DLNA Media Server TITLE:=UPnP A/V & DLNA Media Server
URL:=http://minidlna.sourceforge.net/ URL:=http://minidlna.sourceforge.net/
DEPENDS:=+libintl +libiconv +libpthread +libexif +libjpeg \ DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \
+libsqlite3 +libffmpeg +libid3tag +libflac +libvorbis +libuuid +libid3tag +libflac +libvorbis +libuuid \
$(ICONV_DEPENDS) $(INTL_DEPENDS)
endef endef
define Package/minidlna/description define Package/minidlna/description

8
net/amule/Makefile
View File

@ -18,6 +18,7 @@ PKG_MD5SUM:=530d9b48187e36f78fc21bb19e94326d
PKG_BUILD_DEPENDS:=libgd PKG_BUILD_DEPENDS:=libgd
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/amule define Package/amule
SUBMENU:=P2P SUBMENU:=P2P
@ -61,10 +62,13 @@ CONFIGURE_ARGS+= \
--with-libpng-prefix="$(STAGING_DIR)/usr" \ --with-libpng-prefix="$(STAGING_DIR)/usr" \
--with-wx-prefix="$(STAGING_DIR)/usr" \ --with-wx-prefix="$(STAGING_DIR)/usr" \
--with-crypto-prefix="$(STAGING_DIR)/usr" \ --with-crypto-prefix="$(STAGING_DIR)/usr" \
--without-libiconv-prefix \ --with-libiconv-prefix="$(ICONV_PREFIX)" \
--without-libintl-prefix \ --with-libintl-prefix="$(INTL_PREFIX)" \
--without-x \ --without-x \
TARGET_LDFLAGS += \
-liconv
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
HOSTCC="$(HOSTCC)" \ HOSTCC="$(HOSTCC)" \

9
net/bitlbee/Makefile
View File

@ -18,15 +18,16 @@ PKG_SOURCE_URL:=http://get.bitlbee.org/src \
http://ftp.snt.utwente.nl/pub/software/bitlbee/src http://ftp.snt.utwente.nl/pub/software/bitlbee/src
PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a
PKG_BUILD_DEPENDS:=libopenssl glib1 libiconv PKG_BUILD_DEPENDS:=libopenssl glib1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/bitlbee define Package/bitlbee
SUBMENU:=Instant Messaging SUBMENU:=Instant Messaging
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libopenssl +glib1 +libiconv DEPENDS:=+libopenssl +glib1 $(ICONV_DEPENDS)
TITLE:=IRC gateway to IM chat networks TITLE:=IRC gateway to IM chat networks
URL:=http://www.bitlbee.org/ URL:=http://www.bitlbee.org/
endef endef
@ -63,11 +64,11 @@ define Build/Configure
); );
$(SED) 's,^CFLAGS=.*,CFLAGS=$(TARGET_CFLAGS),g'\ $(SED) 's,^CFLAGS=.*,CFLAGS=$(TARGET_CFLAGS),g'\
$(PKG_BUILD_DIR)/Makefile.settings $(PKG_BUILD_DIR)/Makefile.settings
@echo 'CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include' >> \ @echo 'CFLAGS+=-I$(ICONV_PREFIX)/include' >> \
$(PKG_BUILD_DIR)/Makefile.settings $(PKG_BUILD_DIR)/Makefile.settings
@echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \ @echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \
$(PKG_BUILD_DIR)/Makefile.settings $(PKG_BUILD_DIR)/Makefile.settings
@echo 'LFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib' >> \ @echo 'LFLAGS+=-L$(ICONV_PREFIX)/lib' >> \
$(PKG_BUILD_DIR)/Makefile.settings $(PKG_BUILD_DIR)/Makefile.settings
endef endef

7
net/curlftpfs/Makefile
View File

@ -15,6 +15,7 @@ PKG_BUILD_DEPENDS:=libiconv
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/curlftpfs define Package/curlftpfs
SECTION:=net SECTION:=net
@ -30,13 +31,13 @@ define Package/curlftpfs/description
endef endef
EXTRA_CFLAGS += \ EXTRA_CFLAGS += \
-I$(STAGING_DIR)/usr/lib/libiconv/include \ -I$(ICONV_PREFIX)/include \
-I$(STAGING_DIR)/usr/include/fuse \ -I$(STAGING_DIR)/usr/include/fuse \
-DICONV_CONST=const -DICONV_CONST=const
EXTRA_LDFLAGS += \ EXTRA_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libintl/lib \ -L$(INTL_PREFIX)/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(ICONV_PREFIX)/lib
define Package/curlftpfs/install define Package/curlftpfs/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin

3
net/ettercap/Makefile
View File

@ -20,6 +20,7 @@ PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/ettercap define Package/ettercap
SECTION:=net SECTION:=net
@ -51,7 +52,7 @@ CONFIGURE_ARGS += \
--with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \
--with-openssl="$(STAGING_DIR)/usr" \ --with-openssl="$(STAGING_DIR)/usr" \
--with-libpcre="$(STAGING_DIR)/usr" \ --with-libpcre="$(STAGING_DIR)/usr" \
--with-iconv="$(STAGING_DIR)/usr" \ --with-iconv="$(ICONV_PREFIX)" \
--with-libncurses="$(STAGING_DIR)/usr" \ --with-libncurses="$(STAGING_DIR)/usr" \
--disable-gtk \ --disable-gtk \
--disable-debug \ --disable-debug \

10
net/gesftpserver/Makefile
View File

@ -21,11 +21,12 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/gesftpserver define Package/gesftpserver
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libpthread +libiconv DEPENDS:=+libpthread $(ICONV_DEPENDS)
TITLE:=SFTP server TITLE:=SFTP server
URL:=http://www.greenend.org.uk/rjk/sftpserver/ URL:=http://www.greenend.org.uk/rjk/sftpserver/
endef endef
@ -41,12 +42,7 @@ CONFIGURE_CMD:=./prepare
TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS) TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS)
TARGET_CFLAGS+= \ TARGET_LDFLAGS+=-lpthread
-I$(STAGING_DIR)/usr/lib/libiconv/include/
TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-lpthread
define Package/gesftpserver/install define Package/gesftpserver/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin

5
net/gmediaserver/Makefile
View File

@ -19,11 +19,12 @@ PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/gmediaserver define Package/gmediaserver
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+id3lib +libiconv +libmagic +file +libupnp +libuuid +uclibcxx +zlib DEPENDS:=+id3lib +libmagic +file +libupnp +libuuid +uclibcxx +zlib $(ICONV_DEPENDS)
TITLE:=An UPnP music media server TITLE:=An UPnP music media server
URL:=http://www.nongnu.org/gmediaserver/ URL:=http://www.nongnu.org/gmediaserver/
SUBMENU:=multimedia SUBMENU:=multimedia
@ -39,7 +40,7 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-rpath \ --disable-rpath \
--enable-threads=posix \ --enable-threads=posix \
--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \ --with-libiconv-prefix="$(ICONV_PREFIX)" \
--without-libintl-prefix \ --without-libintl-prefix \
--with-id3lib="$(STAGING_DIR)/usr" \ --with-id3lib="$(STAGING_DIR)/usr" \
--with-libupnp="$(STAGING_DIR)/usr" \ --with-libupnp="$(STAGING_DIR)/usr" \

5
net/imspector/Makefile
View File

@ -17,6 +17,7 @@ PKG_SOURCE_URL:=http://www.imspector.org/downloads
PKG_MD5SUM:=626abf7c2b8f15d56df679ad66624575 PKG_MD5SUM:=626abf7c2b8f15d56df679ad66624575
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/imspector define Package/imspector
SECTION:=net SECTION:=net
@ -25,7 +26,7 @@ define Package/imspector
TITLE:=IMSpector is an Instant Messenger proxy TITLE:=IMSpector is an Instant Messenger proxy
URL:=http://www.imspector.org URL:=http://www.imspector.org
DEPENDS:=+libopenssl +libstdcpp +libmysqlclient +libsqlite3 +libpq \ DEPENDS:=+libopenssl +libstdcpp +libmysqlclient +libsqlite3 +libpq \
+libiconv +libpthread +libpthread $(ICONV_DEPENDS)
endef endef
define Package/imspector/description define Package/imspector/description
@ -54,7 +55,7 @@ define Build/Compile
PREFIX="$(STAGING_DIR)/usr" \ PREFIX="$(STAGING_DIR)/usr" \
CXX=$(TARGET_CXX) \ CXX=$(TARGET_CXX) \
CXXFLAGS="$(TARGET_CXXFLAGS) $(TARGET_CFLAGS) $(FPIC) $(TARGET_CPPFLAGS) \ CXXFLAGS="$(TARGET_CXXFLAGS) $(TARGET_CFLAGS) $(FPIC) $(TARGET_CPPFLAGS) \
-I$(STAGING_DIR)/usr/lib/libiconv/include \ -I$(ICONV_PREFIX)/include \
$(TARGET_LDFLAGS) -DHAVE_SSL" \ $(TARGET_LDFLAGS) -DHAVE_SSL" \
all all
endef endef

12
net/irssi/Makefile
View File

@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/irssi/Default define Package/irssi/Default
SUBMENU:=Instant Messaging SUBMENU:=Instant Messaging
@ -66,15 +67,8 @@ CONFIGURE_ARGS += \
--without-bot \ --without-bot \
--disable-proxy --disable-proxy
EXTRA_CFLAGS+= \ EXTRA_CFLAGS+=$(TARGET_CPPFLAGS)
$(TARGET_CPPFLAGS) \ EXTRA_LDFLAGS+=-lncurses
-I$(STAGING_DIR)/usr/lib/libiconv/include \
-I$(STAGING_DIR)/usr/lib/libintl/include
EXTRA_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-lncurses
ifeq ($(BUILD_VARIANT),ssl) ifeq ($(BUILD_VARIANT),ssl)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \

11
net/nufw/Makefile
View File

@ -19,11 +19,12 @@ PKG_FIXUP:=libtool
PKG_REMOVE_FILES:=autogen.sh aclocal.m4 PKG_REMOVE_FILES:=autogen.sh aclocal.m4
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/nufw/Default define Package/nufw/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+glib2 +libgnutls +libsasl2 +libintl +libiconv +libnetfilter-queue DEPENDS:=+glib2 +libgnutls +libsasl2 +libnetfilter-queue $(ICONV_DEPENDS) $(INTL_DEPENDS)
TITLE:=nufw TITLE:=nufw
URL:=http://www.nufw.org/ URL:=http://www.nufw.org/
endef endef
@ -79,11 +80,11 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
-I$(STAGING_DIR)/usr/lib/libintl/include \ -I$(INTL_PREFIX)/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include" \ -I$(ICONV_PREFIX)/include" \
LDFLAGS="$(TARGET_LDFLAGS) \ LDFLAGS="$(TARGET_LDFLAGS) \
-L$(STAGING_DIR)/usr/lib/libintl/lib \ -L$(INTL_PREFIX)/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \ -L$(ICONV_PREFIX)/lib \
-Wl,-rpath-link,$(STAGING_DIR)/usr/lib -liconv \ -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -liconv \
-lgnutls -lnetfilter_queue -lpthread" \ -lgnutls -lnetfilter_queue -lpthread" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \

1
net/sshfs/Makefile
View File

@ -18,6 +18,7 @@ PKG_MD5SUM:=26e9206eb5169e87e6f95f54bc005a4f
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-fuse-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-fuse-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/sshfs define Package/sshfs
TITLE:=SSHFS TITLE:=SSHFS

11
net/synce-dccm/Makefile
View File

@ -18,11 +18,12 @@ PKG_MD5SUM:=8818b71133049fe9c739166225aebe0c
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/synce-dccm define Package/synce-dccm
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libsynce +libiconv DEPENDS:=+libsynce $(ICONV_DEPENDS)
TITLE:=dccm for mobiles TITLE:=dccm for mobiles
URL:=http://sourceforge.net/projects/synce/ URL:=http://sourceforge.net/projects/synce/
endef endef
@ -32,14 +33,14 @@ Description TBD
endef endef
CONFIGURE_VARS+= \ CONFIGURE_VARS+= \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \ CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \ CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \
CPPFLAGS="$$$$CPPFLAGS -Wl,-rpath-link,$(STAGING_DIR)/usr/lib:$(STAGING_DIR)/usr/lib/libiconv/lib:$(STAGING_DIR)/usr/lib/libintl/lib" CPPFLAGS="$$$$CPPFLAGS -Wl,-rpath-link,$(STAGING_DIR)/usr/lib:$(ICONV_PREFIX)/lib:$(INTL_PREFIX)/lib"
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib" \ LDFLAGS="$(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib" \
LIBS="-lsynce -liconv" \ LIBS="-lsynce -liconv" \
all install all install
endef endef

6
net/usbip/Makefile
View File

@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/usbip/Common define Package/usbip/Common
TITLE:=USB-over-IP TITLE:=USB-over-IP
@ -93,11 +94,6 @@ LIBTOOL_PATHS:=./src
CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libintl/lib/
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include/
TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib/
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
(cd $(PKG_BUILD_DIR)/src; autoreconf -v --install || exit 1 ) (cd $(PKG_BUILD_DIR)/src; autoreconf -v --install || exit 1 )

7
net/weechat/Makefile
View File

@ -19,6 +19,7 @@ PKG_FIXUP = libtool
PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_weechat-mod-lua PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_weechat-mod-lua
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/weechat/Default define Package/weechat/Default
SUBMENU:=Instant Messaging SUBMENU:=Instant Messaging
@ -36,7 +37,7 @@ endef
define Package/weechat define Package/weechat
$(call Package/weechat/Default) $(call Package/weechat/Default)
MENU=1 MENU=1
DEPENDS:=+libiconv +libgnutls +libncurses DEPENDS:=+libgnutls +libncurses $(ICONV_DEPENDS)
endef endef
define Package/weechat/description define Package/weechat/description
@ -72,7 +73,7 @@ CONFIGURE_ARGS+= \
--with-debug=0 \ --with-debug=0 \
--with-libgnutls-prefix=$(STAGING_DIR)/usr \ --with-libgnutls-prefix=$(STAGING_DIR)/usr \
--without-doc-xsl-prefix \ --without-doc-xsl-prefix \
--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \ --with-libiconv-prefix="$(ICONV_PREFIX)" \
--without-libintl-prefix \ --without-libintl-prefix \
--disable-aspell \ --disable-aspell \
--disable-perl \ --disable-perl \
@ -82,7 +83,7 @@ CONFIGURE_ARGS+= \
ac_cv_path_LIBGNUTLS_CONFIG="pkg-config gnutls" \ ac_cv_path_LIBGNUTLS_CONFIG="pkg-config gnutls" \
TARGET_LDFLAGS += \ TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \ -L$(ICONV_PREFIX)/lib \
-Wl,-rpath-link,$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
ifneq ($(CONFIG_PACKAGE_weechat-mod-lua),) ifneq ($(CONFIG_PACKAGE_weechat-mod-lua),)

12
sound/mpd/Makefile
View File

@ -19,6 +19,7 @@ PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/mpd define Package/mpd
SECTION:=sound SECTION:=sound
@ -84,15 +85,8 @@ CONFIGURE_VARS += \
$(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \ $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
$(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
TARGET_CFLAGS += \ TARGET_CFLAGS += -std=gnu99
-std=gnu99 \ TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-I$(STAGING_DIR)/usr/lib/libiconv/include/ \
TARGET_LDFLAGS += \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
# use gcc instead of g++ to avoid unnecessary linking against libstdc++ # use gcc instead of g++ to avoid unnecessary linking against libstdc++
TARGET_CXX:=$(TARGET_CC) TARGET_CXX:=$(TARGET_CC)

9
sound/mpdas/Makefile
View File

@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://50hz.ws/mpdas
PKG_MD5SUM:=8a694691dcb5d217c46754e40152186a PKG_MD5SUM:=8a694691dcb5d217c46754e40152186a
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/mpdas define Package/mpdas
SECTION:=sound SECTION:=sound
@ -33,12 +34,12 @@ define Package/mpdas/description
endef endef
EXTRA_CPPFLAGS:=\ EXTRA_CPPFLAGS:=\
-I$(STAGING_DIR)/usr/lib/libintl/include \ -I$(ICONV_PREFIX)/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include \ -I$(INTL_PREFIX)/include \
EXTRA_LDFLAGS:=\ EXTRA_LDFLAGS:=\
-L$(STAGING_DIR)/usr/lib/libintl/lib \ -L$(ICONV_PREFIX)/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib \ -L$(INTL_PREFIX)/lib \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
MAKE_FLAGS += \ MAKE_FLAGS += \

5
sound/pulseaudio/Makefile
View File

@ -22,12 +22,13 @@ PKG_FIXUP = libtool
PKG_INSTALL = 1 PKG_INSTALL = 1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
#TODO: split pulse into executable and library (or even better into several libraries since they're used as loadable modules, so not linked into) #TODO: split pulse into executable and library (or even better into several libraries since they're used as loadable modules, so not linked into)
define Package/pulseaudio define Package/pulseaudio
SECTION:=sound SECTION:=sound
CATEGORY:=Sound CATEGORY:=Sound
DEPENDS:=+libspeexdsp +libgdbm +liboil +libsndfile +libatomicops +libltdl +dbus +libpthread +librt +libintl +libiconv +alsa-lib @BROKEN DEPENDS:=+libspeexdsp +libgdbm +liboil +libsndfile +libatomicops +libltdl +dbus +libpthread +librt +alsa-lib $(ICONV_DEPENDS) $(INTL_DEPENDS) @BROKEN
TITLE:=Network sound server TITLE:=Network sound server
URL:=http://www.pulseaudio.org URL:=http://www.pulseaudio.org
endef endef
@ -66,7 +67,7 @@ CONFIGURE_ARGS += \
CONFIGURE_VARS += \ CONFIGURE_VARS += \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
#SUPP_LIBS:=-L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib #SUPP_LIBS:=-L$(INTL_PREFIX)/lib -L$(ICONV_PREFIX)/lib
TARGET_CFLAGS += -std=gnu99 TARGET_CFLAGS += -std=gnu99
define Package/pulseaudio/install define Package/pulseaudio/install

7
utils/bemused/Makefile
View File

@ -16,11 +16,12 @@ PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526
PKG_MD5SUM:=aed8b41aed530e9177e43d9bebad10b7 PKG_MD5SUM:=aed8b41aed530e9177e43d9bebad10b7
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/bemusedlinuxserver define Package/bemusedlinuxserver
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp +libiconv DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp $(ICONV_DEPENDS)
TITLE:=Bemused linux server TITLE:=Bemused linux server
URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/ URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/
endef endef
@ -38,8 +39,8 @@ define Build/Compile
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) " \ LDFLAGS="$(TARGET_LDFLAGS) " \
CPPFLAGS="$(TARGET_CPPFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS)" \
INCL="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include" \ INCL="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(ICONV_PREFIX)/include" \
MYLIBS="-lbluetooth -lglib -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv" MYLIBS="-lbluetooth -lglib -L$(ICONV_PREFIX)/lib -liconv"
$(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver $(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver
endef endef

7
utils/bluez-utils/Makefile
View File

@ -18,11 +18,12 @@ PKG_MD5SUM:=4fc292b635ba7b442c7aaf5680199012
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/bluez-utils define Package/bluez-utils
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+bluez-libs +libpthread +dbus +libintl +libiconv DEPENDS:=+bluez-libs +libpthread +dbus $(INTL_DEPENDS) $(ICONV_DEPENDS)
TITLE:=Bluetooth utilities TITLE:=Bluetooth utilities
URL:=http://www.bluez.org/ URL:=http://www.bluez.org/
endef endef
@ -49,8 +50,8 @@ CONFIGURE_ARGS += \
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
LDFLAGS="$(TARGET_LDFLAGS) \ LDFLAGS="$(TARGET_LDFLAGS) \
-L$(STAGING_DIR)/usr/lib/libintl/lib \ -L$(ICONV_PREFIX)/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib" \ -L$(INTL_PREFIX)/lib" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install all install
endef endef

11
utils/gnuplot/Makefile
View File

@ -11,15 +11,10 @@ PKG_SOURCE_URL:=@SF/gnuplot
PKG_MD5SUM:=e708665bd512153ad5c35252fe499059 PKG_MD5SUM:=e708665bd512153ad5c35252fe499059
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/lib/libintl/include \
-I$(STAGING_DIR)/usr/lib/libiconv/include
TARGET_LDFLAGS+= \ TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libintl/lib \
-L$(STAGING_DIR)/usr/lib/libiconv/lib
CONFIGURE_VARS += \ CONFIGURE_VARS += \
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
@ -29,7 +24,7 @@ CONFIGURE_VARS += \
define Package/gnuplot define Package/gnuplot
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libncurses +uclibcxx +zlib +libpng +libfreetype +libgd +libintl +libiconv DEPENDS:=+libncurses +uclibcxx +zlib +libpng +libfreetype +libgd $(INTL_DEPENDS) $(ICONV_DEPENDS)
TITLE:=A portable command-line driven graphing utility TITLE:=A portable command-line driven graphing utility
URL:=http://sourceforge.net/projects/gnuplot/ URL:=http://sourceforge.net/projects/gnuplot/
endef endef

6
utils/lcd4linux/Makefile
View File

@ -24,7 +24,6 @@ PKG_INSTALL:=1
PKG_BUILD_DEPENDS:= \ PKG_BUILD_DEPENDS:= \
libdbus \ libdbus \
libgd \ libgd \
libiconv \
libmysqlclient \ libmysqlclient \
libncurses \ libncurses \
libnmeap \ libnmeap \
@ -39,6 +38,7 @@ PKG_BUILD_DEPENDS:= \
# python \ # python \
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/lcd4linux define Package/lcd4linux
SECTION:=utils SECTION:=utils
@ -46,7 +46,7 @@ define Package/lcd4linux
DEPENDS:= \ DEPENDS:= \
+LCD4LINUX_NEEDS_libdbus:libdbus \ +LCD4LINUX_NEEDS_libdbus:libdbus \
+LCD4LINUX_NEEDS_libgd:libgd \ +LCD4LINUX_NEEDS_libgd:libgd \
+LCD4LINUX_NEEDS_libiconv:libiconv \ $(if $(ICONV_FULL),+LCD4LINUX_NEEDS_libiconv:libiconv-full) \
+LCD4LINUX_NEEDS_libmysqlclient:libmysqlclient \ +LCD4LINUX_NEEDS_libmysqlclient:libmysqlclient \
+LCD4LINUX_NEEDS_libncurses:libncurses \ +LCD4LINUX_NEEDS_libncurses:libncurses \
+LCD4LINUX_NEEDS_libnmeap:libnmeap \ +LCD4LINUX_NEEDS_libnmeap:libnmeap \
@ -195,7 +195,7 @@ EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
ifneq ($(CONFIG_LCD4LINUX_NEEDS_libiconv),) ifneq ($(CONFIG_LCD4LINUX_NEEDS_libiconv),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" --with-libiconv-prefix="$(ICONV_PREFIX)"
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--without-libiconv-prefix --without-libiconv-prefix