Attachment #182546 for bug #216236

Lines 29-38 Link Here

(-)Makefile (-3 / +3 lines)
29	@cd ${WRKSRC} && ${MAKE_ENV} jam -q -fJambase -j${MAKE_JOBS_NUMBER}	29	@cd ${WRKSRC} && ${MAKE_ENV} jam -q -fJambase -j${MAKE_JOBS_NUMBER}
30		30
31	do-install:	31	do-install:
32	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \	32	cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \
33	REFSUBDIR=share/argyll/ref \	33	${MAKE_ENV} REFSUBDIR=share/argyll/ref \
34	jam -q -fJambase -j${MAKE_JOBS_NUMBER} install	34	jam -q -fJambase -j${MAKE_JOBS_NUMBER} install
35	@${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \	35	${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \
36	${STAGEDIR}${PREFIX}/share/argyll/	36	${STAGEDIR}${PREFIX}/share/argyll/
37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*	37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
38		38




- 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
 #
 




- 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 ]

Return to bug 216236

Lines 1-6 Link Here

(-)files/patch-Jambase (-3 / +15 lines)
1	--- Jambase.bak 2016-09-28 02:58:53.000000000 +0000	1	- LOCALBASE patch: see PR 216236
2	+++ Jambase 2017-05-11 19:43:36.780841000 +0000	2	- AR patch: see r440675
3	@@ -999,7 +999,11 @@	3
		4	--- Jambase.orig 2016-09-28 02:58:53 UTC
		5	+++ Jambase
		6	@@ -966,7 +966,7 @@ else if $(UNIX)
		7	YACCFILES ?= y.tab ;
		8	YACCFLAGS ?= -d ;
		9
		10	- HDRS ?= /usr/local/include ;
		11	+ HDRS ?= $(LOCALBASE)/include ;
		12
		13	# Add some good defaults for OS X
		14	if $(OS) = MACOSX {
		15	@@ -999,7 +999,11 @@ else if $(UNIX)
4	# General defaults; a lot like UNIX	16	# General defaults; a lot like UNIX
5	#	17	#
6		18

Line 0 Link Here

(-)files/patch-Jamtop (+51 lines)
	1	- LOCALBASE patch: see PR 216236
	2
	3	--- Jamtop.orig 2016-09-28 02:58:53 UTC
	4	+++ Jamtop
	5	@@ -76,8 +76,8 @@ if $(UNIX) {
	6	LibWinH = /usr/X11R6/include ;
	7	} else if [ GLOB /usr/include/X11 : X.h ] {
	8	LibWinH = /usr/include ;
	9	- } else if [ GLOB /usr/local/include/X11 : X.h ] {
	10	- LibWinH = /usr/local/include ;
	11	+ } else if [ GLOB $(LOCALBASE)/include/X11 : X.h ] {
	12	+ LibWinH = $(LOCALBASE)/include ;
	13	} else {
	14	EXIT Unable to locate the X11 include files ;
	15	}
	16	@@ -91,8 +91,8 @@ if $(UNIX) {
	17	LibWinD = /usr/lib64 ;
	18	} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
	19	LibWinD = /usr/lib ;
	20	- } else if [ GLOB /usr/local/lib : libX11.so libX11.a ] {
	21	- LibWinD = /usr/local/lib ;
	22	+ } else if [ GLOB $(LOCALBASE)/lib : libX11.so libX11.a ] {
	23	+ LibWinD = $(LOCALBASE)/lib ;
	24	} else {
	25	ECHO Unable to locate the 64 bit X11 library files ;
	26	}
	27	@@ -103,8 +103,8 @@ if $(UNIX) {
	28	LibWinD = /usr/lib/i386-linux-gnu ;
	29	} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
	30	LibWinD = /usr/lib ;
	31	- } else if [ GLOB /usr/local/lib : libX11.so libX11.a ] {
	32	- LibWinD = /usr/local/lib ;
	33	+ } else if [ GLOB $(LOCALBASE)/lib : libX11.so libX11.a ] {
	34	+ LibWinD = $(LOCALBASE)/lib ;
	35	} else {
	36	ECHO Unable to locate the 32 bit X11 library files ;
	37	}
	38	@@ -140,11 +140,11 @@ rule CheckForLibrary {
	39
	40	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
	41	if [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
	42	- \|\| [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
	43	+ \|\| [ GLOB $(LOCALBASE)/include$(subd) : $(lcase).h $(lcase)lib.h ]
	44	\|\| [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
	45	\|\| [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
	46	if [ GLOB /usr/lib : lib$(lcase).so ] \|\| [ GLOB /usr/lib : lib$(lcase).a ]
	47	- \|\| [ GLOB /usr/local/lib : lib$(lcase).so ] \|\| [ GLOB /usr/local/lib : lib$(lcase).a ]
	48	+ \|\| [ GLOB $(LOCALBASE)/lib : lib$(lcase).so ] \|\| [ GLOB $(LOCALBASE)/lib : lib$(lcase).a ]
	49	\|\| [ GLOB /usr/lib64 : lib$(lcase).so ] \|\| [ GLOB /usr/lib64 : lib$(lcase).a ]
	50	\|\| [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
	51	\|\| [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]