X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5b87a75e7d1e1d0efa4011d336cb5749deb17c4e..20baebab2ac3f56f63aa3aa695dae9ca0d69baac:/package/rrdtool/Makefile

diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 2b97a530e..3bea4aa9a 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -20,13 +20,14 @@ $(eval $(call PKG_template,LIBRRD,librrd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,RRDCGI,rrdcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,RRDTOOL,rrdtool,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
+		LIBS="-lnotimpl" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		$(TARGET_CONFIGURE_OPTS) \
 		rd_cv_ieee_works=yes \
 		./configure \
 			--target=$(GNU_TARGET_NAME) \
@@ -49,6 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 			--enable-shared=yes \
 			--enable-static=yes \
 			--disable-rpath \
+			--with-gnu-ld \
 			--enable-rrdcgi \
 			--disable-mmap \
 			--disable-perl \
@@ -69,31 +71,32 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_RRDTOOL):
 	install -d -m0755 $(IDIR_RRDTOOL)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/rrdtool
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/rrdupdate
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/
 	$(RSTRIP) $(IDIR_RRDTOOL)
 	$(IPKG_BUILD) $(IDIR_RRDTOOL) $(PACKAGE_DIR)
 
 $(IPKG_RRDCGI):
 	install -d -m0755 $(IDIR_RRDCGI)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/rrdcgi
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/
 	$(RSTRIP) $(IDIR_RRDCGI)
 	$(IPKG_BUILD) $(IDIR_RRDCGI) $(PACKAGE_DIR)
 
 $(IPKG_LIBRRD):
 	install -d -m0755 $(IDIR_LIBRRD)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib/
 	install -d -m0755 $(IDIR_LIBRRD)/usr/share/rrdtool/fonts
-	cp -fpR $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
+	$(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
 		$(IDIR_LIBRRD)/usr/share/rrdtool/fonts/
 	$(RSTRIP) $(IDIR_LIBRRD)
 	$(IPKG_BUILD) $(IDIR_LIBRRD) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/librrd.so
@@ -101,7 +104,8 @@ install-dev: $(STAGING_DIR)/usr/lib/librrd.so
 uninstall-dev:
 	rm -rf \
 		$(STAGING_DIR)/usr/include/rrd.h \
-		$(STAGING_DIR)/usr/lib/librrd.{a,so*} \
+		$(STAGING_DIR)/usr/lib/librrd.a \
+		$(STAGING_DIR)/usr/lib/librrd.so* \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev