svn commit: r564088 - in head/x11: linux-nvidia-libs nvidia-driver nvidia-driver/files nvidia-settings nvidia-xconfig

[Craig Leres]

On 2/7/21 5:38 PM, Alexey Dokuchaev wrote:
> On Sun, Feb 07, 2021 at 01:04:15PM -0800, Craig Leres wrote:
>> On 2/6/21 12:57 AM, Alexey Dokuchaev wrote:
>>> Thanks for the report, should be fixed in r564208 (or so I hope, I could
>>> not reproduce it, but there is upstream issue which suggested similar,
>>> albeit not completely identical fix*).
>>>
>>> *)https://github.com/NVIDIA/nvidia-settings/issues/59
>> My poudriere build server failed to build this version this morning.
>> I'll append the specific errors, let me know if you'd like to see the
>> whole log.
> No, it's fine.  Could you apply suggested patch with explicit $(MKDIR)
> from that issue #59 and rerun your tests?  Now that I've studied their
> makefiles closer, they actually do call it explicitly as part of the
> recipe for other similar targets. :(

I've appended a patchset that does this. It builds in poudriere by 
itself, tomorrow I'll report how it did when part of a ~1000 port build 
(that when it's been failing).

		Craig
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 564646)
+++ Makefile	(working copy)
@@ -50,8 +50,6 @@
 		${WRKSRC}/doc/nvidia-settings.desktop
 	${REINPLACE_CMD} -e 's|/usr/share/nvidia/|${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/|' \
 		${WRKSRC}/src/gtk+-2.x/ctkappprofile.c
-	${REINPLACE_CMD} -e 's,notdir $$(1)).h:,& | $$$$(OUTPUTDIR),' \
-		${WRKSRC}/src/Makefile
 
 post-install:	.SILENT
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnvidia-gtk2.so.${PORTVERSION}
Index: files/patch-src_Makefile
===================================================================
--- files/patch-src_Makefile	(nonexistent)
+++ files/patch-src_Makefile	(working copy)
@@ -0,0 +1,10 @@
+--- src/Makefile.orig	2021-01-26 17:16:45 UTC
++++ src/Makefile
+@@ -242,6 +242,7 @@ endif
+ 
+ define BINARY_DATA_HEADER_RULE
+   $$(OUTPUTDIR)/$(notdir $(1)).h:
++	$(at_if_quiet)$(MKDIR) $$(OUTPUTDIR)
+ 	$(at_if_quiet){ \
+ 	  $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_start[];\n"; \
+ 	  $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_end[];\n"; \

Property changes on: files/patch-src_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property