Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtklib: update to 2.4.3 b34; fix patches

Browse source 
Signed-off-by: Yaroslav Petrov <info@lank.me>
This commit is contained in:
Yaroslav Petrov 2022-01-31 00:59:09 +01:00 committed by Nuno Goncalves
parent cb4719789c
commit 71e81d9cb2
3 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
utils/rtklib/Makefile
View file

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=rtklib PKG_NAME:=rtklib
PKG_VERSION:=2.4.3_b32 PKG_VERSION:=2.4.3_b34
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/tomojitakasu/RTKLIB PKG_SOURCE_URL:=https://github.com/tomojitakasu/RTKLIB
PKG_SOURCE_VERSION:=6e5ddadb737c54d4a43c43feeeb4e244c51b4286 PKG_SOURCE_VERSION:=180043ee24b6d2b168f98b64be15f69d50046b1a
PKG_MIRROR_HASH:=b6ada49b6667a98e935055e718bf9a5712030cddc1694d1be7c0ab0e98bdc7b8 PKG_MIRROR_HASH:=e6485140152b623b4fd5e579ee14c2658dd173ed38070b32e49869aad202277c
PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com> PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
@ -58,36 +58,36 @@ endef
define Build/Compile define Build/Compile
rm -rf $(PKG_INSTALL_DIR) rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR)/app/convbin/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR)/app/consapp/convbin/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
$(MAKE) -C $(PKG_BUILD_DIR)/app/pos2kml/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR)/app/consapp/pos2kml/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
$(MAKE) -C $(PKG_BUILD_DIR)/app/rnx2rtkp/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR)/app/consapp/rnx2rtkp/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
$(MAKE) -C $(PKG_BUILD_DIR)/app/rtkrcv/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR)/app/consapp/rtkrcv/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
$(MAKE) -C $(PKG_BUILD_DIR)/app/str2str/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR)/app/consapp/str2str/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)"
endef endef
define Package/convbin/install define Package/convbin/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/convbin/gcc/convbin $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/app/consapp/convbin/gcc/convbin $(1)/usr/bin/
endef endef
define Package/pos2kml/install define Package/pos2kml/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/pos2kml/gcc/pos2kml $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/app/consapp/pos2kml/gcc/pos2kml $(1)/usr/bin/
endef endef
define Package/rnx2rtkp/install define Package/rnx2rtkp/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/rnx2rtkp/gcc/rnx2rtkp $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/app/consapp/rnx2rtkp/gcc/rnx2rtkp $(1)/usr/bin/
endef endef
define Package/rtkrcv/install define Package/rtkrcv/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/rtkrcv/gcc/rtkrcv $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/app/consapp/rtkrcv/gcc/rtkrcv $(1)/usr/bin/
endef endef
define Package/str2str/install define Package/str2str/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/str2str/gcc/str2str $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/app/consapp/str2str/gcc/str2str $(1)/usr/bin/
endef endef
$(eval $(call BuildPackage,convbin)) $(eval $(call BuildPackage,convbin))

2
utils/rtklib/patches/010-musl.patch
View file

@ -1,6 +1,6 @@
--- a/src/stream.c --- a/src/stream.c
+++ b/src/stream.c +++ b/src/stream.c
@@ -81,6 +81,9 @@ @@ -92,6 +92,9 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <arpa/inet.h> #include <arpa/inet.h>

18
utils/rtklib/patches/020-no-gfortran.patch
View file

@ -1,21 +1,13 @@
--- a/app/rnx2rtkp/gcc/makefile --- a/app/consapp/rnx2rtkp/gcc/makefile
+++ b/app/rnx2rtkp/gcc/makefile +++ b/app/consapp/rnx2rtkp/gcc/makefile
@@ -2,14 +2,14 @@ @@ -8,8 +8,8 @@ OPTS = -DTRACE -DENAGLO -DENAQZS -DEN
BINDIR = /usr/local/bin
SRC = ../../../src
-#OPTS = -DTRACE -DENAGLO -DENAQZS -DENAGAL -DENACMP -DENAIRN -DNFREQ=3
-OPTS = -DTRACE -DENAGLO -DENAQZS -DENAGAL -DENACMP -DENAIRN -DNFREQ=3 -DIERS_MODEL
+OPTS = -DTRACE -DENAGLO -DENAQZS -DENAGAL -DENACMP -DENAIRN -DNFREQ=3
+#OPTS = -DTRACE -DENAGLO -DENAQZS -DENAGAL -DENACMP -DENAIRN -DNFREQ=3 -DIERS_MODEL
#OPTS = -DENAGLO -DENAQZS -DENAGAL -DENACMP -DNFREQ=2
# for no lapack # for no lapack
CFLAGS = -Wall -O3 -ansi -pedantic -Wno-unused-but-set-variable -I$(SRC) $(OPTS) -g CFLAGS = -Wall -O3 -ansi -pedantic -Wno-unused-but-set-variable -I$(SRC) $(OPTS) -g
-#LDLIBS = -lm -lrt -#LDLIBS = -lm -lrt
-LDLIBS = ../../../lib/iers/gcc/iers.a -lgfortran -lm -lrt -LDLIBS = ../../../../lib/iers/gcc/iers.a -lgfortran -lm -lrt
+LDLIBS = -lm -lrt +LDLIBS = -lm -lrt
+#LDLIBS = ../../../lib/iers/gcc/iers.a -lgfortran -lm -lrt +#LDLIBS = ../../../../lib/iers/gcc/iers.a -lgfortran -lm -lrt
#CFLAGS = -Wall -O3 -ansi -pedantic -Wno-unused-but-set-variable -I$(SRC) -DLAPACK $(OPTS) #CFLAGS = -Wall -O3 -ansi -pedantic -Wno-unused-but-set-variable -I$(SRC) -DLAPACK $(OPTS)
#LDLIBS = -lm -lrt -llapack -lblas #LDLIBS = -lm -lrt -llapack -lblas