Yes. Right.
The question revolves around the authors use of the SYSROOT variable.
Ptxdist declares it and this is taken up as a --sysroot variable to the
toolchain, offsetting all headers etc to the ptxdist sysroot.
Which means standard headers etc are lost.
So the question is really. Is SYSROOT a reserved variable?
I can't really make that out. Or is the authors assumption that SYSROOT
means what it means wrong?
Regards,
Christian
On 1/28/22 10:26 AM, Michael Olbrich wrote:
What's WIP here.
On Thu, Jan 27, 2022 at 03:35:29PM +0100, Christian Melki wrote:
Update pps-tools. Very minor bugfix release.
Remove old patch as that one got fixed upstream.
Add a patch to remove inclusion of SYSROOT.
Signed-off-by: Christian Melki <[email protected]>
---
...le-fix-installation-to-empty-DESTDIR.patch | 40 -------------------
patches/pps-tools-1.0.2/series | 4 --
.../0001-Makefile-fix-remove-SYSROOT.patch | 14 +++++++
patches/pps-tools-1.0.3/series | 1 +
rules/pps-tools.make | 4 +-
5 files changed, 17 insertions(+), 46 deletions(-)
delete mode 100644
patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
delete mode 100644 patches/pps-tools-1.0.2/series
create mode 100644
patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
create mode 100644 patches/pps-tools-1.0.3/series
diff --git
a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
deleted file mode 100644
index 97498dc22..000000000
---
a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Thomas Petazzoni <[email protected]>
-Date: Mon, 3 Dec 2018 13:55:02 +0100
-Subject: [PATCH] Makefile: fix installation to empty DESTDIR
-
-When DESTDIR is empty, or at least does not contain usr/bin or
-usr/include, the installation fails, because install does not create
-those intermediate directories:
-
-$ make DESTDIR=/tmp/koin install
-install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
-install: failed to access '/tmp/koin/usr/bin': No such file or directory
-
-Using the -D option of install fixes this:
-
-$ make DESTDIR=/tmp/koin install
-install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
-install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Origin: upstream;
https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1
-Signed-off-by: Roland Hieber <[email protected]>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 939466885e9f..30672f79585c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,8 +19,8 @@ include .depend
- endif
-
- install : all
-- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
-- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
-+ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
-+ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
-
- uninstall :
- for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done
diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/series
deleted file mode 100644
index 7b3c77623..000000000
--- a/patches/pps-tools-1.0.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Makefile-fix-installation-to-empty-DESTDIR.patch
-# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic
diff --git a/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
Path header if you keep the patch.
new file mode 100644
index 000000000..7b160ef9a
--- /dev/null
+++ b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
@@ -0,0 +1,14 @@
+diff -urN pps-tools-1.0.3.orig/Makefile pps-tools-1.0.3/Makefile
+--- pps-tools-1.0.3.orig/Makefile 2022-01-27 11:20:18.590907158 +0100
++++ pps-tools-1.0.3/Makefile 2022-01-27 11:20:35.771295930 +0100
+@@ -3,10 +3,6 @@
+ CFLAGS += -Wall -O2 -D_GNU_SOURCE
+ CFLAGS += -ggdb
+ CFLAGS += -fPIC
+-ifdef SYSROOT
+-CFLAGS += --sysroot $(SYSROOT)
+-endif
+-
I think adding 'SYSROOT=' to PPS_TOOLS_MAKE_ENV should work instead of
this.
Michael
+ LDLIBS += -lm
+
+ # -- Actions section --
diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series
new file mode 100644
index 000000000..23495d2ef
--- /dev/null
+++ b/patches/pps-tools-1.0.3/series
@@ -0,0 +1 @@
+0001-Makefile-fix-remove-SYSROOT.patch
diff --git a/rules/pps-tools.make b/rules/pps-tools.make
index 65a06c7d1..789659154 100644
--- a/rules/pps-tools.make
+++ b/rules/pps-tools.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PPS_TOOLS) += pps-tools
#
# Paths and names
#
-PPS_TOOLS_VERSION := 1.0.2
-PPS_TOOLS_MD5 := 6eddfeb151cffe8751f4766e428b8eb7
+PPS_TOOLS_VERSION := 1.0.3
+PPS_TOOLS_MD5 := 9b18c55efe020d02c26cd8c759ac258d
PPS_TOOLS := pps-tools-$(PPS_TOOLS_VERSION)
PPS_TOOLS_SUFFIX := tar.gz
PPS_TOOLS_URL :=
https://github.com/redlab-i/pps-tools/archive/v$(PPS_TOOLS_VERSION).$(PPS_TOOLS_SUFFIX)
--
2.30.2
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
