This is the mail archive of the frysk@sources.redhat.com mailing list for the frysk project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: More /usr/lib64 fixes

From: Andrew Cagney <cagney at redhat dot com>
To: Diego Novillo <dnovillo at redhat dot com>
Cc: frysk at sourceware dot org
Date: Thu, 26 Jan 2006 11:23:34 -0500
Subject: Re: More /usr/lib64 fixes
References: <43D8F318.8020703@redhat.com>

Diego Novillo wrote:

I don't think these really affect the main installation, but for
completeness.  The patch defines a new environment variable (GEN_LIB)
that's set to lib64 on 64 bit hosts.

OK to apply?

Sure, however, while you're there, you might as well just wack references to /opt/frysk/. The latest jumbo rpm (for both FC-4 and RHEL-4) install into /usr/lib/frysk/ so /opt/frysk is dead.

Andrew

------------------------------------------------------------------------

2006-01-26 Diego Novillo <dnovillo@redhat.com>

	* common/acinclude.m4 (GEN_LIB): Define.
	* frysk-gtk/tests/Makefile.am (textiter/a.out): Use.
	(gcjtreeiter/a.out): Use.

Index: common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.39
diff -d -u -p -r1.39 acinclude.m4
--- common/acinclude.m4	14 Jan 2006 14:46:20 -0000	1.39
+++ common/acinclude.m4	26 Jan 2006 15:54:26 -0000
@@ -82,3 +82,4 @@ AM_PROG_AS

lib=`pkg-config --debug 2>&1 |awk -F '/' '/^Scanning.*pkgconfig.$/ { print $(NF - 1); exit; }'`
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/$lib/pkgconfig:/usr/$lib/frysk/pkgconfig
+export GEN_LIB=$lib
Index: frysk-core/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.39
diff -d -u -p -r1.39 acinclude.m4
--- frysk-core/common/acinclude.m4	14 Jan 2006 14:46:20 -0000	1.39
+++ frysk-core/common/acinclude.m4	26 Jan 2006 15:54:26 -0000
@@ -82,3 +82,4 @@ AM_PROG_AS

lib=`pkg-config --debug 2>&1 |awk -F '/' '/^Scanning.*pkgconfig.$/ { print $(NF - 1); exit; }'`
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/$lib/pkgconfig:/usr/$lib/frysk/pkgconfig
+export GEN_LIB=$lib
Index: frysk-gtk/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.39
diff -d -u -p -r1.39 acinclude.m4
--- frysk-gtk/common/acinclude.m4	14 Jan 2006 14:46:20 -0000	1.39
+++ frysk-gtk/common/acinclude.m4	26 Jan 2006 15:54:26 -0000
@@ -82,3 +82,4 @@ AM_PROG_AS

lib=`pkg-config --debug 2>&1 |awk -F '/' '/^Scanning.*pkgconfig.$/ { print $(NF - 1); exit; }'`
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/$lib/pkgconfig:/usr/$lib/frysk/pkgconfig
+export GEN_LIB=$lib
Index: frysk-gtk/tests/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-gtk/tests/Makefile.am,v
retrieving revision 1.1
diff -d -u -p -r1.1 Makefile.am
--- frysk-gtk/tests/Makefile.am	5 Jan 2006 22:03:39 -0000	1.1
+++ frysk-gtk/tests/Makefile.am	26 Jan 2006 15:54:26 -0000
@@ -59,8 +59,8 @@ textiter/a.out: $(textiter_FILES)
	$(GCJ) -g \
		-classpath $(FRYSK_GTK_CLASSPATH) \
		$(FRYSK_GTK_LIBS) \
-		-Wl,-rpath,/opt/frysk/lib:/usr/lib/frysk \
-		-Djava.library.path=/opt/frysk/lib:/usr/lib/frysk \
+		-Wl,-rpath,/opt/frysk/$(GEN_LIB):/usr/$(GEN_LIB)/frysk \
+		-Djava.library.path=/opt/frysk/lib:/usr/$(GEN_LIB)/frysk \
		--main=textiter.JNICrash \
		-o textiter/a.out \
		$(srcdir)/textiter/JNICrash.java
@@ -73,8 +73,8 @@ gcjtreeiter/a.out: $(gcjtreeiter_FILES)
	$(GCJ) -g \
		-classpath $(FRYSK_GTK_CLASSPATH) \
		$(FRYSK_GTK_LIBS) \
-		-Wl,-rpath,/opt/frysk/lib:/usr/lib/frysk \
-		-Djava.library.path=/opt/frysk/lib:/usr/lib/frysk \
+		-Wl,-rpath,/opt/frysk/lib:/usr/$(GEN_LIB)/frysk \
+		-Djava.library.path=/opt/frysk/$(GEN_LIB):/usr/$(GEN_LIB)/frysk \
		--main=gcjtreeiter.IterTest \
		$(srcdir)/gcjtreeiter/IterTest.java \
		-o gcjtreeiter/a.out
@@ -85,7 +85,7 @@ gcjtreeiter/gij.sh: $(gcjtreeiter_FILES)
		-classpath $(FRYSK_GTK_CLASSPATH) \
		$(srcdir)/gcjtreeiter/IterTest.java
	echo $(GIJ) -classpath .:$(FRYSK_GTK_CLASSPATH) \
-		-Djava.library.path=/opt/frysk/lib:/usr/lib/frysk \
+		-Djava.library.path=/opt/frysk/lib:/usr/$(GEN_LIB)/frysk \
		gcjtreeiter.IterTest \
		> gcjtreeiter/gij.sh
	chmod a+x gcjtreeiter/gij.sh
Index: frysk-imports/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.39
diff -d -u -p -r1.39 acinclude.m4
--- frysk-imports/common/acinclude.m4	14 Jan 2006 14:46:20 -0000	1.39
+++ frysk-imports/common/acinclude.m4	26 Jan 2006 15:54:27 -0000
@@ -82,3 +82,4 @@ AM_PROG_AS

lib=`pkg-config --debug 2>&1 |awk -F '/' '/^Scanning.*pkgconfig.$/ { print $(NF - 1); exit; }'`
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/$lib/pkgconfig:/usr/$lib/frysk/pkgconfig
+export GEN_LIB=$lib
Index: frysk-sys/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.39
diff -d -u -p -r1.39 acinclude.m4
--- frysk-sys/common/acinclude.m4	14 Jan 2006 14:46:20 -0000	1.39
+++ frysk-sys/common/acinclude.m4	26 Jan 2006 15:54:27 -0000
@@ -82,3 +82,4 @@ AM_PROG_AS

lib=`pkg-config --debug 2>&1 |awk -F '/' '/^Scanning.*pkgconfig.$/ { print $(NF - 1); exit; }'` export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/$lib/pkgconfig:/usr/$lib/frysk/pkgconfig +export GEN_LIB=$lib

Follow-Ups:
- Re: More /usr/lib64 fixes
  - From: Diego Novillo

References:
- More /usr/lib64 fixes
  - From: Diego Novillo

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]