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]

Fix build on x86-64


With this patch I can build frysk on x86-64.  I tried launching the GUI, 
but this is a remote box and some X applications do not launch properly 
via the ssh forwarded X11 settings.

I got these failures from 'make check'.  Not sure whether they're 
important:

FAIL: anoncall/a.out
FAIL: rh174912ice/gcj.sh
FAIL: wrongclass/gcj.sh
FAIL: cdtparserversion/cdttest.sh
FAIL: TestRunner
FAIL: textiter/a.out

Most of the changes in the patch are just the replicated patch to 
common/acinclude.m4.

OK to install?
2006-01-13  Diego Novillo  <dnovillo@redhat.com>

common/

	* acinclude.m4: Use lib64 if appropriate.


frysk-gtk/tlwidgets/

	* Makefile.am (CFLAGS): Add -fPIC -DPIC.
	(ftkstripchart.o, ftkconsole.o): Use.
	(Stripchart.o): Add -fPIC.

Index: common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.33
diff -d -u -p -r1.33 acinclude.m4
--- common/acinclude.m4	11 Dec 2005 01:42:29 -0000	1.33
+++ common/acinclude.m4	14 Jan 2006 01:30:00 -0000
@@ -80,4 +80,5 @@ test "x$FIG2DEV" = x && AC_MSG_ERROR([no
 
 AM_PROG_AS
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/lib/pkgconfig:/usr/lib/frysk/pkgconfig
+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
Index: frysk-core/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.33
diff -d -u -p -r1.33 acinclude.m4
--- frysk-core/common/acinclude.m4	11 Dec 2005 01:42:29 -0000	1.33
+++ frysk-core/common/acinclude.m4	14 Jan 2006 01:30:01 -0000
@@ -80,4 +80,5 @@ test "x$FIG2DEV" = x && AC_MSG_ERROR([no
 
 AM_PROG_AS
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/lib/pkgconfig:/usr/lib/frysk/pkgconfig
+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
Index: frysk-gtk/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.33
diff -d -u -p -r1.33 acinclude.m4
--- frysk-gtk/common/acinclude.m4	11 Dec 2005 01:42:29 -0000	1.33
+++ frysk-gtk/common/acinclude.m4	14 Jan 2006 01:30:01 -0000
@@ -80,4 +80,5 @@ test "x$FIG2DEV" = x && AC_MSG_ERROR([no
 
 AM_PROG_AS
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/lib/pkgconfig:/usr/lib/frysk/pkgconfig
+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
Index: frysk-gtk/tlwidgets/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-gtk/tlwidgets/Makefile.am,v
retrieving revision 1.1
diff -d -u -p -r1.1 Makefile.am
--- frysk-gtk/tlwidgets/Makefile.am	5 Jan 2006 16:55:42 -0000	1.1
+++ frysk-gtk/tlwidgets/Makefile.am	14 Jan 2006 01:30:01 -0000
@@ -56,6 +56,7 @@ EXTRA_DIST= $(tlwidgetssrc)/java/com/red
 
 CLEANFILES = *.so *.jar *.o *.class
 SRC= $(tlwidgetssrc)/java/com/redhat/ftk/Stripchart.java
+CFLAGS += -fPIC -DPIC -std=gnu99
 
 com/redhat/ftk/Stripchart.class: $(SRC) 
 	$(GCJ) -C -d . -classpath $(FRYSK_GTK_CLASSPATH) $(SRC)
@@ -65,7 +66,7 @@ ftk.jar: com/redhat/ftk/Stripchart.class
 
 Stripchart.o: $(tlwidgetssrc)/java/com/redhat/ftk/Stripchart.java
 	$(GCJ) -fjni -classpath $(FRYSK_GTK_CLASSPATH) -I ./src/java \
-            -g -O2 -c $< -o $@
+            -g -O2 -fPIC -c $< -o $@
 
 libftkjava.so: Stripchart.o
 	$(GCJ) -shared $^ $(FRYSK_GTK_LIBS) \
@@ -78,10 +79,10 @@ libftkjni.so: com_redhat_ftk_Stripchart.
 	$(CC) -shared $^ $(FRYSK_GTK_LIBS) -o $@
 
 ftkstripchart.o: $(tlwidgetssrc)/widgets/ftkstripchart.c  $(tlwidgetssrc)/widgets/ftkstripchart.h
-	$(CC) $(CFLAGS) -std=gnu99 $(FRYSK_GTK_CFLAGS) -I$(tlwidgetssrc)/widgets -c -o $@ $<
+	$(CC) $(CFLAGS) $(FRYSK_GTK_CFLAGS) -I$(tlwidgetssrc)/widgets -c -o $@ $<
 
 ftkconsole.o: $(tlwidgetssrc)/widgets/ftkconsole.c  $(tlwidgetssrc)/widgets/ftkconsole.h
-	$(CC) $(CFLAGS) -std=gnu99 $(FRYSK_GTK_CFLAGS) -I$(tlwidgetssrc)/widgets -c -o $@ $<
+	$(CC) $(CFLAGS) $(FRYSK_GTK_CFLAGS) -I$(tlwidgetssrc)/widgets -c -o $@ $<
 
 libftk.so: ftkstripchart.o ftkconsole.o
 	$(CC) -shared -o $@ $^ -lrt
Index: frysk-gui/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.33
diff -d -u -p -r1.33 acinclude.m4
--- frysk-gui/common/acinclude.m4	11 Dec 2005 01:42:29 -0000	1.33
+++ frysk-gui/common/acinclude.m4	14 Jan 2006 01:30:01 -0000
@@ -80,4 +80,5 @@ test "x$FIG2DEV" = x && AC_MSG_ERROR([no
 
 AM_PROG_AS
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/lib/pkgconfig:/usr/lib/frysk/pkgconfig
+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
Index: frysk-imports/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.33
diff -d -u -p -r1.33 acinclude.m4
--- frysk-imports/common/acinclude.m4	11 Dec 2005 01:42:29 -0000	1.33
+++ frysk-imports/common/acinclude.m4	14 Jan 2006 01:30:03 -0000
@@ -80,4 +80,5 @@ test "x$FIG2DEV" = x && AC_MSG_ERROR([no
 
 AM_PROG_AS
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/lib/pkgconfig:/usr/lib/frysk/pkgconfig
+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
Index: frysk-sys/common/acinclude.m4
===================================================================
RCS file: /cvs/frysk/frysk-common/acinclude.m4,v
retrieving revision 1.33
diff -d -u -p -r1.33 acinclude.m4
--- frysk-sys/common/acinclude.m4	11 Dec 2005 01:42:29 -0000	1.33
+++ frysk-sys/common/acinclude.m4	14 Jan 2006 01:30:03 -0000
@@ -80,4 +80,5 @@ test "x$FIG2DEV" = x && AC_MSG_ERROR([no
 
 AM_PROG_AS
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/frysk/lib/pkgconfig:/usr/lib/frysk/pkgconfig
+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

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