CVS commit: pkgsrc/x11/libXt

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Apr  4 12:41:24 UTC 2022

Modified Files:
        pkgsrc/x11/libXt: distinfo
Added Files:
        pkgsrc/x11/libXt/patches: patch-util_Makefile.in

Log Message:
x11/libXt: Fix pie-bitrotted cross-build.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/libXt/patches/patch-util_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libXt/distinfo
diff -u pkgsrc/x11/libXt/distinfo:1.17 pkgsrc/x11/libXt/distinfo:1.18
--- pkgsrc/x11/libXt/distinfo:1.17      Tue Oct 26 11:34:07 2021
+++ pkgsrc/x11/libXt/distinfo   Mon Apr  4 12:41:24 2022
@@ -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

Added files:

Index: pkgsrc/x11/libXt/patches/patch-util_Makefile.in
diff -u /dev/null pkgsrc/x11/libXt/patches/patch-util_Makefile.in:1.1
--- /dev/null   Mon Apr  4 12:41:24 2022
+++ pkgsrc/x11/libXt/patches/patch-util_Makefile.in     Mon Apr  4 12:41:24 2022
@@ -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)