* [PATCH v2] tools/python: pass more -rpath-link options to ld
@ 2020-11-04 14:57 Jan Beulich
2020-11-04 17:19 ` Elliott Mitchell
2020-11-04 17:22 ` Marek Marczykowski
0 siblings, 2 replies; 4+ messages in thread
From: Jan Beulich @ 2020-11-04 14:57 UTC (permalink / raw)
To: xen-devel@lists.xenproject.org; +Cc: Marek Marczykowski
With the split of libraries, I've observed a number of warnings from
(old?) ld.
Instead of duplicating the additions in two places, introduce a setup.py
make variable holding all the common parts of the invocations.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
v2: Pass on and use SHLIB_libxen*.
---
It's unclear to me whether this is ld version dependent - the pattern
of where I've seen such warnings doesn't suggest a clear version
dependency.
Obviously (I think) the other similar variables (XEN_libxen*,
CFLAGS_libxen*, etc) would better also be made use of to eliminate at
least most of the PATH_* variables, but that's not the purpose of this
change.
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -8,19 +8,21 @@ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
INSTALL_LOG = build/installed_files.txt
+setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" \
+ SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \
+ SHLIB_libxenguest="$(SHLIB_libxenguest)" \
+ SHLIB_libxenstore="$(SHLIB_libxenstore)" \
+ $(PYTHON) setup.py
+
.PHONY: build
build:
- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
+ $(setup.py) build
.PHONY: install
install:
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
-
- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
- LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
- --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+ $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
--root="$(DESTDIR)" --force
-
$(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
--- a/tools/python/setup.py
+++ b/tools/python/setup.py
@@ -4,6 +4,10 @@ import os, sys
XEN_ROOT = "../.."
+SHLIB_libxenctrl = os.environ['SHLIB_libxenctrl'].split()
+SHLIB_libxenguest = os.environ['SHLIB_libxenguest'].split()
+SHLIB_libxenstore = os.environ['SHLIB_libxenstore'].split()
+
extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
PATH_XEN = XEN_ROOT + "/tools/include"
@@ -24,7 +28,7 @@ xc = Extension("xc",
library_dirs = [ PATH_LIBXENCTRL, PATH_LIBXENGUEST ],
libraries = [ "xenctrl", "xenguest" ],
depends = [ PATH_LIBXENCTRL + "/libxenctrl.so", PATH_LIBXENGUEST + "/libxenguest.so" ],
- extra_link_args = [ "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ],
+ extra_link_args = SHLIB_libxenctrl + SHLIB_libxenguest,
sources = [ "xen/lowlevel/xc/xc.c" ])
xs = Extension("xs",
@@ -33,6 +37,7 @@ xs = Extension("xs",
library_dirs = [ PATH_XENSTORE ],
libraries = [ "xenstore" ],
depends = [ PATH_XENSTORE + "/libxenstore.so" ],
+ extra_link_args = SHLIB_libxenstore,
sources = [ "xen/lowlevel/xs/xs.c" ])
plat = os.uname()[0]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] tools/python: pass more -rpath-link options to ld
2020-11-04 14:57 [PATCH v2] tools/python: pass more -rpath-link options to ld Jan Beulich
@ 2020-11-04 17:19 ` Elliott Mitchell
2020-11-05 8:27 ` Jan Beulich
2020-11-04 17:22 ` Marek Marczykowski
1 sibling, 1 reply; 4+ messages in thread
From: Elliott Mitchell @ 2020-11-04 17:19 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel@lists.xenproject.org, Marek Marczykowski
On Wed, Nov 04, 2020 at 03:57:49PM +0100, Jan Beulich wrote:
> --- a/tools/python/Makefile
> +++ b/tools/python/Makefile
> @@ -8,19 +8,21 @@ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
> PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
> INSTALL_LOG = build/installed_files.txt
>
> +setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" \
> + SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \
> + SHLIB_libxenguest="$(SHLIB_libxenguest)" \
> + SHLIB_libxenstore="$(SHLIB_libxenstore)" \
> + $(PYTHON) setup.py
> +
> .PHONY: build
> build:
> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
> + $(setup.py) build
>
> .PHONY: install
> install:
> $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
> -
> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
> - LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
> - --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
> + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
> --root="$(DESTDIR)" --force
> -
> $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
> $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
Shouldn't similar work of moving all the environment variable settings to
a $(setup.py) variable be done for tools/pygrub/Makefile?
tools/python/Makefile and tools/pygrub/Makefile are presently quite
similar and keeping them similar seems a Good Idea(tm).
--
(\___(\___(\______ --=> 8-) EHM <=-- ______/)___/)___/)
\BS ( | ehem+sigmsg@m5p.com PGP 87145445 | ) /
\_CS\ | _____ -O #include <stddisclaimer.h> O- _____ | / _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] tools/python: pass more -rpath-link options to ld
2020-11-04 14:57 [PATCH v2] tools/python: pass more -rpath-link options to ld Jan Beulich
2020-11-04 17:19 ` Elliott Mitchell
@ 2020-11-04 17:22 ` Marek Marczykowski
1 sibling, 0 replies; 4+ messages in thread
From: Marek Marczykowski @ 2020-11-04 17:22 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel@lists.xenproject.org
[-- Attachment #1: Type: text/plain, Size: 3666 bytes --]
On Wed, Nov 04, 2020 at 03:57:49PM +0100, Jan Beulich wrote:
> With the split of libraries, I've observed a number of warnings from
> (old?) ld.
>
> Instead of duplicating the additions in two places, introduce a setup.py
> make variable holding all the common parts of the invocations.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> ---
> v2: Pass on and use SHLIB_libxen*.
> ---
> It's unclear to me whether this is ld version dependent - the pattern
> of where I've seen such warnings doesn't suggest a clear version
> dependency.
>
> Obviously (I think) the other similar variables (XEN_libxen*,
> CFLAGS_libxen*, etc) would better also be made use of to eliminate at
> least most of the PATH_* variables, but that's not the purpose of this
> change.
>
> --- a/tools/python/Makefile
> +++ b/tools/python/Makefile
> @@ -8,19 +8,21 @@ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
> PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
> INSTALL_LOG = build/installed_files.txt
>
> +setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" \
> + SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \
> + SHLIB_libxenguest="$(SHLIB_libxenguest)" \
> + SHLIB_libxenstore="$(SHLIB_libxenstore)" \
> + $(PYTHON) setup.py
> +
> .PHONY: build
> build:
> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
> + $(setup.py) build
>
> .PHONY: install
> install:
> $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
> -
> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
> - LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
> - --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
> + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
> --root="$(DESTDIR)" --force
> -
> $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
> $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
>
> --- a/tools/python/setup.py
> +++ b/tools/python/setup.py
> @@ -4,6 +4,10 @@ import os, sys
>
> XEN_ROOT = "../.."
>
> +SHLIB_libxenctrl = os.environ['SHLIB_libxenctrl'].split()
> +SHLIB_libxenguest = os.environ['SHLIB_libxenguest'].split()
> +SHLIB_libxenstore = os.environ['SHLIB_libxenstore'].split()
> +
> extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
>
> PATH_XEN = XEN_ROOT + "/tools/include"
> @@ -24,7 +28,7 @@ xc = Extension("xc",
> library_dirs = [ PATH_LIBXENCTRL, PATH_LIBXENGUEST ],
> libraries = [ "xenctrl", "xenguest" ],
> depends = [ PATH_LIBXENCTRL + "/libxenctrl.so", PATH_LIBXENGUEST + "/libxenguest.so" ],
> - extra_link_args = [ "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ],
> + extra_link_args = SHLIB_libxenctrl + SHLIB_libxenguest,
> sources = [ "xen/lowlevel/xc/xc.c" ])
>
> xs = Extension("xs",
> @@ -33,6 +37,7 @@ xs = Extension("xs",
> library_dirs = [ PATH_XENSTORE ],
> libraries = [ "xenstore" ],
> depends = [ PATH_XENSTORE + "/libxenstore.so" ],
> + extra_link_args = SHLIB_libxenstore,
> sources = [ "xen/lowlevel/xs/xs.c" ])
>
> plat = os.uname()[0]
--
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] tools/python: pass more -rpath-link options to ld
2020-11-04 17:19 ` Elliott Mitchell
@ 2020-11-05 8:27 ` Jan Beulich
0 siblings, 0 replies; 4+ messages in thread
From: Jan Beulich @ 2020-11-05 8:27 UTC (permalink / raw)
To: Elliott Mitchell; +Cc: xen-devel@lists.xenproject.org, Marek Marczykowski
On 04.11.2020 18:19, Elliott Mitchell wrote:
> On Wed, Nov 04, 2020 at 03:57:49PM +0100, Jan Beulich wrote:
>> --- a/tools/python/Makefile
>> +++ b/tools/python/Makefile
>> @@ -8,19 +8,21 @@ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS)
>> PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS)
>> INSTALL_LOG = build/installed_files.txt
>>
>> +setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" \
>> + SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \
>> + SHLIB_libxenguest="$(SHLIB_libxenguest)" \
>> + SHLIB_libxenstore="$(SHLIB_libxenstore)" \
>> + $(PYTHON) setup.py
>> +
>> .PHONY: build
>> build:
>> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
>> + $(setup.py) build
>>
>> .PHONY: install
>> install:
>> $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
>> -
>> - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
>> - LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
>> - --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
>> + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
>> --root="$(DESTDIR)" --force
>> -
>> $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
>> $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
>
> Shouldn't similar work of moving all the environment variable settings to
> a $(setup.py) variable be done for tools/pygrub/Makefile?
>
> tools/python/Makefile and tools/pygrub/Makefile are presently quite
> similar and keeping them similar seems a Good Idea(tm).
The only dependency there is libfsimage - I don't even know whether
the same approach can be used there. If it can, I'd say: Likely, but
I've not observed a similar problem with pygrub, and it's only the
build problem I'm after here, sorry. As said in the post-commit-
message remark, I think there's more consolidation to be done here,
too, and I think it's at that point when pygrub, as applicable,
should also be brought in sync.
Jan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-05 8:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-04 14:57 [PATCH v2] tools/python: pass more -rpath-link options to ld Jan Beulich
2020-11-04 17:19 ` Elliott Mitchell
2020-11-05 8:27 ` Jan Beulich
2020-11-04 17:22 ` Marek Marczykowski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.