diff options
| author | Yaroslav Petrov <info@lank.me> | 2022-01-31 00:59:09 +0100 |
|---|---|---|
| committer | Nuno Goncalves <nunojpg@gmail.com> | 2022-02-03 10:58:22 +0100 |
| commit | 71e81d9cb27019db52b6a9ff20f9ff62ccc0429a (patch) | |
| tree | a3f63f96faf6b14f7e25d156b35a945982d1290c /utils/rtklib | |
| parent | cb4719789ce3a349759699cca5b1c5cda93d36bd (diff) | |
rtklib: update to 2.4.3 b34; fix patches
Signed-off-by: Yaroslav Petrov <info@lank.me>
Diffstat (limited to 'utils/rtklib')
| -rw-r--r-- | utils/rtklib/Makefile | 26 | ||||
| -rw-r--r-- | utils/rtklib/patches/010-musl.patch | 2 | ||||
| -rw-r--r-- | utils/rtklib/patches/020-no-gfortran.patch | 18 |
3 files changed, 19 insertions, 27 deletions
diff --git a/utils/rtklib/Makefile b/utils/rtklib/Makefile index 571985235..bd0eb6020 100644 --- a/utils/rtklib/Makefile +++ b/utils/rtklib/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtklib -PKG_VERSION:=2.4.3_b32 +PKG_VERSION:=2.4.3_b34 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tomojitakasu/RTKLIB -PKG_SOURCE_VERSION:=6e5ddadb737c54d4a43c43feeeb4e244c51b4286 -PKG_MIRROR_HASH:=b6ada49b6667a98e935055e718bf9a5712030cddc1694d1be7c0ab0e98bdc7b8 +PKG_SOURCE_VERSION:=180043ee24b6d2b168f98b64be15f69d50046b1a +PKG_MIRROR_HASH:=e6485140152b623b4fd5e579ee14c2658dd173ed38070b32e49869aad202277c PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com> PKG_LICENSE:=BSD-2-Clause @@ -58,36 +58,36 @@ endef define Build/Compile rm -rf $(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/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/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/convbin/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/consapp/rnx2rtkp/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/consapp/str2str/gcc CC="$(TARGET_CC) $(TARGET_CFLAGS)" endef define Package/convbin/install $(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 define Package/pos2kml/install $(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 define Package/rnx2rtkp/install $(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 define Package/rtkrcv/install $(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 define Package/str2str/install $(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 $(eval $(call BuildPackage,convbin)) diff --git a/utils/rtklib/patches/010-musl.patch b/utils/rtklib/patches/010-musl.patch index 14a405fed..7e237d5cf 100644 --- a/utils/rtklib/patches/010-musl.patch +++ b/utils/rtklib/patches/010-musl.patch @@ -1,6 +1,6 @@ --- a/src/stream.c +++ b/src/stream.c -@@ -81,6 +81,9 @@ +@@ -92,6 +92,9 @@ #include <netinet/in.h> #include <netinet/tcp.h> #include <arpa/inet.h> diff --git a/utils/rtklib/patches/020-no-gfortran.patch b/utils/rtklib/patches/020-no-gfortran.patch index 3bbd2fbe7..2357bf18c 100644 --- a/utils/rtklib/patches/020-no-gfortran.patch +++ b/utils/rtklib/patches/020-no-gfortran.patch @@ -1,21 +1,13 @@ ---- a/app/rnx2rtkp/gcc/makefile -+++ b/app/rnx2rtkp/gcc/makefile -@@ -2,14 +2,14 @@ - 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 +--- a/app/consapp/rnx2rtkp/gcc/makefile ++++ b/app/consapp/rnx2rtkp/gcc/makefile +@@ -8,8 +8,8 @@ OPTS = -DTRACE -DENAGLO -DENAQZS -DEN # for no lapack CFLAGS = -Wall -O3 -ansi -pedantic -Wno-unused-but-set-variable -I$(SRC) $(OPTS) -g -#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 = ../../../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) #LDLIBS = -lm -lrt -llapack -lblas |