diff options
| author | riastradh <riastradh@pkgsrc.org> | 2022-04-04 12:41:24 +0000 |
|---|---|---|
| committer | riastradh <riastradh@pkgsrc.org> | 2022-04-04 12:41:24 +0000 |
| commit | 8f96b6f7e4d1ff8f914be5791e1af5ef1573d11b (patch) | |
| tree | 68be08ee236ad12f6082aa839eb392e9e849e6e5 /x11 | |
| parent | 04e5db239bcbd6426338da8b9a3298c64f81e574 (diff) | |
| download | pkgsrc-8f96b6f7e4d1ff8f914be5791e1af5ef1573d11b.tar.gz | |
x11/libXt: Fix pie-bitrotted cross-build.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libXt/distinfo | 3 | ||||
| -rw-r--r-- | x11/libXt/patches/patch-util_Makefile.in | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/x11/libXt/distinfo b/x11/libXt/distinfo index a418b660ddd..96b1b4d79c6 100644 --- a/x11/libXt/distinfo +++ b/x11/libXt/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.17 2021/10/26 11:34:07 nia Exp $ +$NetBSD: distinfo,v 1.18 2022/04/04 12:41:24 riastradh Exp $ BLAKE2s (libXt-1.2.1.tar.bz2) = c6ce46ac3e89ecb54ad821be76578f6c4e60b6a7ae0d98c0df167f8196889987 SHA512 (libXt-1.2.1.tar.bz2) = 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c Size (libXt-1.2.1.tar.bz2) = 784610 bytes +SHA1 (patch-util_Makefile.in) = 388bc6eeed85f30f13daa93d9efc48b31ef1b76d diff --git a/x11/libXt/patches/patch-util_Makefile.in b/x11/libXt/patches/patch-util_Makefile.in new file mode 100644 index 00000000000..f759c7a59af --- /dev/null +++ b/x11/libXt/patches/patch-util_Makefile.in @@ -0,0 +1,24 @@ +$NetBSD: patch-util_Makefile.in,v 1.1 2022/04/04 12:41:24 riastradh Exp $ + +The rules to build the makestrs tool go through libtool, which goes +through the wrong wrappers as if for cross-compiling, which is wrong +for a tool that is run during the build. In practice, this manifests +as a PIE linking failure: the .o file was built without -fPIE, but the +wrapper causes linker to be invoked with -pie. Just use CC_FOR_BUILD +directly to avoid this. + +--- util/Makefile.in.orig 2021-01-24 14:47:52.000000000 +0000 ++++ util/Makefile.in +@@ -394,7 +394,11 @@ clean-noinstPROGRAMS: + + makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) $(EXTRA_makestrs_DEPENDENCIES) + @rm -f makestrs$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(makestrs_OBJECTS) $(LIBS_FOR_BUILD) ++ ++makestrs.$(OBJEXT): makestrs.c ++ $(AM_V_CC)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + + mostlyclean-compile: + -rm -f *.$(OBJEXT) |