X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1f96d69f566aa785c0f0fb4fb25e6198a96bb4c3..986deefdb48e2ec9ab63f17c256981e72c3c8999:/openwrt/package/gpsd/Makefile

diff --git a/openwrt/package/gpsd/Makefile b/openwrt/package/gpsd/Makefile
index 2161fb75e..cd45b4ccb 100644
--- a/openwrt/package/gpsd/Makefile
+++ b/openwrt/package/gpsd/Makefile
@@ -22,10 +22,10 @@ $(PKG_BUILD_DIR)/.configured:
 	( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++"  \
+		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++"  \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		LIBS="-nodefaultlibs -luClibc++ -lc -lm -lnotimpl" \
+		LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		LIBS="-luClibc++ -lc -lm -lnotimpl" \
 		./configure \
 			--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
@@ -49,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured:
 			--enable-shared \
 			--enable-static \
 			--with-gnu-ld \
+			--without-x \
 	);
 	touch $@
 
@@ -63,18 +64,18 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_GPSD):
 	install -d -m0755 $(IDIR_GPSD)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(IDIR_GPSD)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(IDIR_GPSD)/usr/lib/
 	install -d -m0755 $(IDIR_GPSD)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(IDIR_GPSD)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(IDIR_GPSD)/usr/sbin/
 	$(RSTRIP) $(IDIR_GPSD)
 	$(IPKG_BUILD) $(IDIR_GPSD) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libgps.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libgps.so