Attachment 182546 Details for Bug 216236 – [patch] [v3] remove hard-coded /usr/local occurrences

[patch] [patch] [v3] remove hard-coded /usr/local occurrences

pr-localbase-v3.diff (text/plain), 4.13 KB, created by John Hein on 2017-05-12 16:13:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2017-05-12 16:13:28 UTC

Size: 4.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 440678)
>+++ Makefile	(working copy)
>@@ -29,10 +29,10 @@
> 	@cd ${WRKSRC} && ${MAKE_ENV} jam -q -fJambase -j${MAKE_JOBS_NUMBER}
> 
> do-install:
>-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \
>-		REFSUBDIR=share/argyll/ref \
>+	cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \
>+		${MAKE_ENV} REFSUBDIR=share/argyll/ref \
> 		jam -q -fJambase -j${MAKE_JOBS_NUMBER} install
>-	@${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \
>+	${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \
> 		${STAGEDIR}${PREFIX}/share/argyll/
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
> 
>Index: files/patch-Jambase
>===================================================================
>--- files/patch-Jambase	(revision 440678)
>+++ files/patch-Jambase	(working copy)
>@@ -1,6 +1,18 @@
>---- Jambase.bak	2016-09-28 02:58:53.000000000 +0000
>-+++ Jambase	2017-05-11 19:43:36.780841000 +0000
>-@@ -999,7 +999,11 @@
>+- LOCALBASE patch: see PR 216236
>+- AR patch: see r440675
>+
>+--- Jambase.orig	2016-09-28 02:58:53 UTC
>++++ Jambase
>+@@ -966,7 +966,7 @@ else if $(UNIX)
>+ 	YACCFILES		?= y.tab ;
>+ 	YACCFLAGS		?= -d ;
>+ 
>+-	HDRS			?= /usr/local/include ;
>++	HDRS			?= $(LOCALBASE)/include ;
>+ 
>+ 	# Add some good defaults for OS X
>+ 	if $(OS) = MACOSX {
>+@@ -999,7 +999,11 @@ else if $(UNIX)
>  # General defaults; a lot like UNIX
>  #
>  
>Index: files/patch-Jamtop
>===================================================================
>--- files/patch-Jamtop	(nonexistent)
>+++ files/patch-Jamtop	(working copy)
>@@ -0,0 +1,51 @@
>+- LOCALBASE patch: see PR 216236
>+
>+--- Jamtop.orig	2016-09-28 02:58:53 UTC
>++++ Jamtop
>+@@ -76,8 +76,8 @@ if $(UNIX) {
>+ 			LibWinH = /usr/X11R6/include ;
>+ 		} else if [ GLOB /usr/include/X11 : X.h ] {
>+ 			LibWinH = /usr/include ;
>+-		} else if [ GLOB /usr/local/include/X11 : X.h ] {
>+-			LibWinH = /usr/local/include ;
>++		} else if [ GLOB $(LOCALBASE)/include/X11 : X.h ] {
>++			LibWinH = $(LOCALBASE)/include ;
>+ 		} else {
>+ 			EXIT Unable to locate the X11 include files ;
>+ 		}
>+@@ -91,8 +91,8 @@ if $(UNIX) {
>+ 				LibWinD = /usr/lib64 ;
>+ 			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
>+ 				LibWinD = /usr/lib ;
>+-			} else if [ GLOB /usr/local/lib : libX11.so libX11.a ] {
>+-				LibWinD = /usr/local/lib ;
>++			} else if [ GLOB $(LOCALBASE)/lib : libX11.so libX11.a ] {
>++				LibWinD = $(LOCALBASE)/lib ;
>+ 			} else {
>+ 				ECHO Unable to locate the 64 bit X11 library files ;
>+ 			}
>+@@ -103,8 +103,8 @@ if $(UNIX) {
>+ 				LibWinD = /usr/lib/i386-linux-gnu ;
>+ 			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
>+ 				LibWinD = /usr/lib ;
>+-			} else if [ GLOB /usr/local/lib : libX11.so libX11.a ] {
>+-				LibWinD = /usr/local/lib ;
>++			} else if [ GLOB $(LOCALBASE)/lib : libX11.so libX11.a ] {
>++				LibWinD = $(LOCALBASE)/lib ;
>+ 			} else {
>+ 				ECHO Unable to locate the 32 bit X11 library files ;
>+ 			}
>+@@ -140,11 +140,11 @@ rule CheckForLibrary {
>+ 
>+ 	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
>+ 		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
>+-	     || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
>++	     || [ GLOB $(LOCALBASE)/include$(subd) : $(lcase).h $(lcase)lib.h ]
>+ 		 || [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
>+ 	     || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
>+ 			if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
>+-			 || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
>++			 || [ GLOB $(LOCALBASE)/lib : lib$(lcase).so ] || [ GLOB $(LOCALBASE)/lib : lib$(lcase).a ]
>+ 			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
>+ 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
>+ 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
>
>Property changes on: files/patch-Jamtop
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 216236: 179037 | 182438 | 182546