Makefile cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/packages@8602 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6dce3393a8
commit
a462f853ff
@ -15,10 +15,6 @@ PKG_RELEASE:=1
|
|||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://download.berlios.de/gpsd/
|
PKG_SOURCE_URL:=http://download.berlios.de/gpsd/
|
||||||
PKG_MD5SUM:=3ff80db0e7d906457e5a7a1b04fcb4ec
|
PKG_MD5SUM:=3ff80db0e7d906457e5a7a1b04fcb4ec
|
||||||
PKG_CAT:=zcat
|
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
|
||||||
|
|
||||||
PKG_BUILD_DEPENDS=libncurses libnotimpl
|
PKG_BUILD_DEPENDS=libncurses libnotimpl
|
||||||
|
|
||||||
@ -32,14 +28,13 @@ define Package/gpsd
|
|||||||
URL:=http://gpsd.berlios.de/
|
URL:=http://gpsd.berlios.de/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Configure
|
CONFIGURE_ARGS += \
|
||||||
$(call Build/Configure/Default, \
|
--without-x \
|
||||||
--without-x \
|
|
||||||
, \
|
CONFIGURE_VARS += \
|
||||||
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
|
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClic++" \
|
||||||
LIBS="-nodefaultlibs -luClibc++ -lnotimpl -lm -lc" \
|
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
|
||||||
)
|
LIBS="-nodefaultlibs -luClibc++ -lnotimpl" \
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
|
@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
|
|||||||
define Package/peerguardian
|
define Package/peerguardian
|
||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
DEPENDS:= +libpthread +libncurses
|
DEPENDS:= +libncurses +libpthread +uclibcxx
|
||||||
TITLE:=PeerGuardian for Linux
|
TITLE:=PeerGuardian for Linux
|
||||||
DESCRIPTION:=\
|
DESCRIPTION:=\
|
||||||
PeerGuardian helps protect your privacy by blocking many ranges \\\
|
PeerGuardian helps protect your privacy by blocking many ranges \\\
|
||||||
@ -39,16 +39,9 @@ define Package/peerguardian/conffiles
|
|||||||
/etc/p2p.p2b.p2p
|
/etc/p2p.p2b.p2p
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
|
CONFIGURE_VARS+= \
|
||||||
PKG_CONFIGURE_LIBS:=-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lm,-lc
|
CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \
|
||||||
|
LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
|
||||||
define Build/Configure
|
|
||||||
$(call Build/Configure/Default, \
|
|
||||||
, \
|
|
||||||
CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \
|
|
||||||
LIBS="$(PKG_CONFIGURE_LIBS)" \
|
|
||||||
)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user