Package: xprint
Severity: normal
Tags: patch
When building 'xprint' on amd64 with gcc-4.0,
I get the following error:
gcc -c -O2 -fno-strength-reduce -ansi -pedantic -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wredundant-decls -Wnested-externs
-Wundef -I../.. -I../../exports/include -Dlinux -D__amd64__
-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE
-D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
-D_GNU_SOURCE
-DFUNCPROTO=15 -DNARROWPROTO -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API
-DMALLOC_0_RETURNS_NULL -fPIC XpPageDim.c
rm -f XpImageRes.o
gcc -c -O2 -fno-strength-reduce -ansi -pedantic -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wredundant-decls -Wnested-externs
-Wundef -I../.. -I../../exports/include -Dlinux -D__amd64__
-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE
-D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
-D_GNU_SOURCE
-DFUNCPROTO=15 -DNARROWPROTO -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API
-DMALLOC_0_RETURNS_NULL -fPIC XpImageRes.c
rm -f libXp.so.6.2~
+ cd .
+ gcc -o ./libXp.so.6.2~ -shared -Wl,-soname,libXp.so.6 XpAttr.o XpContext.o
XpDoc.o XpExtUtil.o XpExtVer.o XpGetData.o XpInput.o XpJob.o XpLocale.o
XpPage.o XpNotifyPdm.o XpPrinter.o XpPutData.o XpScreens.o XpPageDim.o
XpImageRes.o -L/usr/X11R6/lib64 -R/usr/X11R6/lib64 -L../../exports/lib -lXext
-lX11 -lc
gcc: unrecognized option '-R/usr/X11R6/lib64'
/usr/bin/ld: cannot find -lXext
collect2: ld returned 1 exit status
make[5]: *** [libXp.so.6.2] Error 1
make[5]: Leaving directory `/xprint-0.1.0.alpha1/build-tree/xc/lib/Xp'
With the attached patch 'xprint' can be compiled
on amd64 using gcc-4.0.
The patch changes the config files to use /usr/X11R6/lib instead of
/usr/X11R6/lib64 on amd64 and ppc64.
The patch also includes a small fix to make the package compile with
gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/xprint-0.1.0.alpha1/debian/patches/94_amd64_ppc64_libdir
./debian/patches/94_amd64_ppc64_libdir
--- ../tmp-orig/xprint-0.1.0.alpha1/debian/patches/94_amd64_ppc64_libdir
1970-01-01 01:00:00.000000000 +0100
+++ ./debian/patches/94_amd64_ppc64_libdir 2005-03-23 12:03:29.000000000
+0100
@@ -0,0 +1,71 @@
+diff -urN tmp/config/cf/linux.cf xc/config/cf/linux.cf
+--- tmp/config/cf/linux.cf 2004-11-08 07:35:26.000000000 +0100
++++ xc/config/cf/linux.cf 2005-03-23 12:02:03.057147432 +0100
+@@ -551,7 +551,7 @@
+ #define MkdirHierCmd mkdir -p
+
+ #ifndef HaveLib64
+-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined
(Ppc64Architecture)
++# if defined (s390xArchitecture)
+ # define HaveLib64 YES
+ # else
+ # define HaveLib64 NO
+diff -urN tmp/extras/Mesa/configs/linux-dri-x86-64
xc/extras/Mesa/configs/linux-dri-x86-64
+--- tmp/extras/Mesa/configs/linux-dri-x86-64 2004-07-22 08:49:32.000000000
+0200
++++ xc/extras/Mesa/configs/linux-dri-x86-64 2005-03-23 12:01:02.428852748
+0100
+@@ -15,12 +15,12 @@
+
+ #ASM_SOURCES = $(X86_SOURCES)
+
+-LIB_DIR = $(TOP)/lib64
++LIB_DIR = $(TOP)/lib
+
+ # Library/program dependencies
+-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
+-GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt
-lXi -lm
+-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lX11
++GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl
++GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt
-lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
+
+ # Directories
+ SRC_DIRS = mesa glu glut/glx glw
+diff -urN tmp/extras/Mesa/configs/linux-x86-64
xc/extras/Mesa/configs/linux-x86-64
+--- tmp/extras/Mesa/configs/linux-x86-64 2004-07-22 08:49:32.000000000
+0200
++++ xc/extras/Mesa/configs/linux-x86-64 2005-03-23 12:00:07.893381426
+0100
+@@ -18,13 +18,13 @@
+ #ASM_SOURCES = $(X86_SOURCES)
+
+
+-LIB_DIR = $(TOP)/lib64
++LIB_DIR = $(TOP)/lib
+
+
+ # Library/program dependencies
+-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread
++GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
+ OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
+ GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
+-GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt
-lXi -lm
+-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lX11
++GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt
-lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
+ APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
+diff -urN tmp/extras/Mesa/configs/linux-x86-64-static
xc/extras/Mesa/configs/linux-x86-64-static
+--- tmp/extras/Mesa/configs/linux-x86-64-static 2004-06-16
11:16:22.000000000 +0200
++++ xc/extras/Mesa/configs/linux-x86-64-static 2005-03-23 12:00:28.879329892
+0100
+@@ -28,7 +28,7 @@
+ #ASM_SOURCES = $(X86_SOURCES)
+
+
+-LIB_DIR = $(TOP)/lib64
++LIB_DIR = $(TOP)/lib
+
+
+ # Library/program dependencies (static libs don't have dependencies)
+@@ -37,4 +37,4 @@
+ GLU_LIB_DEPS =
+ GLUT_LIB_DEPS =
+ GLW_LIB_DEPS =
+-APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXext
-lXmu -lXt -lXi -lpthread -lm -lstdc++
++APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXext
-lXmu -lXt -lXi -lpthread -lm -lstdc++
diff -urN ../tmp-orig/xprint-0.1.0.alpha1/debian/patches/95_gcc4_fix
./debian/patches/95_gcc4_fix
--- ../tmp-orig/xprint-0.1.0.alpha1/debian/patches/95_gcc4_fix 1970-01-01
01:00:00.000000000 +0100
+++ ./debian/patches/95_gcc4_fix 2005-03-23 12:35:16.849237850 +0100
@@ -0,0 +1,14 @@
+diff -urN tmp/programs/Xserver/Xprint/attributes.h
xc/programs/Xserver/Xprint/attributes.h
+--- tmp/programs/Xserver/Xprint/attributes.h 2004-04-23 20:57:32.000000000
+0200
++++ xc/programs/Xserver/Xprint/attributes.h 2005-03-23 12:31:30.807500571
+0100
+@@ -109,8 +109,8 @@
+ char *ReplaceFileString(char *string,
+ char *inFileName,
+ char *outFileName);
+-void ExecCommand(char *pCommand,
+- char **argVector);
++/*void ExecCommand(char *pCommand,
++ char **argVector);*/
+ int TransferBytes(FILE *pSrcFile,
+ FILE *pDstFile,
+ int numBytes);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
