Bug 17509 - xorg-server-1.5.0 incorrect Makefile.* files
Summary: xorg-server-1.5.0 incorrect Makefile.* files
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Server/General (show other bugs)
Version: unspecified
Hardware: x86 (IA32) Solaris
: medium normal
Assignee: Xorg Project Team
QA Contact: Xorg Project Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-09-09 23:30 UTC by Yevgeniy
Modified: 2009-08-03 20:01 UTC (History)
0 users

See Also:
i915 platform:
i915 features:


Attachments

Description Yevgeniy 2008-09-09 23:30:09 UTC
During building xserver 1.5.0 in the directory other than source dir I got following error messages:

-- 1 --
(cd .libs && rm -f libsolaris.la && ln -s ../libsolaris.la libsolaris.la)
cpp -P -DINLINE_ASM solaris-ia32.S > solaris-ia32.il
cpp: solaris-ia32.S: No such file or directory
cpp: no input files
gmake[5]: *** [solaris-ia32.il] Error 1
gmake[5]: Leaving directory `/home/unix/build/hw/xfree86/os-support/solaris'
gmake[4]: *** [all-recursive] Error 1
gmake[4]: Leaving directory `/home/unix/build/hw/xfree86/os-support'
gmake[3]: *** [all-recursive] Error 1
gmake[3]: Leaving directory `/home/unix/build/hw/xfree86'
gmake[2]: *** [all] Error 2

My fix was:
xorg-server-1.5.0/hw/xfree86/os-support/solaris/Makefile.am Line: 18
--        $(CPP) -P -DINLINE_ASM solaris-@SOLARIS_INOUT_ARCH@.S > $@
++        $(CPP) -P -DINLINE_ASM $(srcdir)/solaris-@SOLARIS_INOUT_ARCH@.S > $@
xorg-server-1.5.0/hw/xfree86/os-support/solaris/Makefile.in Line: 815
--        $(CPP) -P -DINLINE_ASM solaris-@SOLARIS_INOUT_ARCH@.S > $@
++        $(CPP) -P -DINLINE_ASM $(srcdir)/solaris-@SOLARIS_INOUT_ARCH@.S > $@

-- 2 --
gcc -march=pentium4 -mtune=pentium4 -Wl,--export-dynamic -Wl,--rpath-link -Wl,/usr/local/lib:/usr/lib:/lib -Wl,--export-dynamic -o kbd_mode kbd_mode-sun-kbd_mode.o  -lsocket -lm
ln -s sun-kbd_mode.man.pre kbd_mode.man.pre
ln: creating symbolic link `kbd_mode.man.pre': File exists
gmake[6]: *** [kbd_mode.man.pre] Error 1
gmake[6]: Leaving directory `/home/unix/build/hw/xfree86/utils/kbd_mode'
gmake[5]: *** [all] Error 2
gmake[5]: Leaving directory `/home/unix/build/hw/xfree86/utils/kbd_mode'
gmake[4]: *** [all-recursive] Error 1

My fix was:
xorg-server-1.5.0/hw/xfree86/utils/kbd_mode/Makefile.am Line: 56
--        $(LN_S) $(MAN_SRC) kbd_mode.man.pre
++        $(LN_S) $(srcdir)/$(MAN_SRC) kbd_mode.man.pre
xorg-server-1.5.0/hw/xfree86/utils/kbd_mode/Makefile.in Line: 814
--@BUILD_KBD_MODE_TRUE@   $(LN_S) $(MAN_SRC) kbd_mode.man.pre
++@BUILD_KBD_MODE_TRUE@   $(LN_S) $(srcdir)/$(MAN_SRC) kbd_mode.man.pre

My OS and tools:
OS: SunOS solaris 5.11 snv_95 i86pc i386 i86pc Solaris
gcc (GCC) 4.3.1
cpp (GCC) 4.3.1
ld (GNU Binutils) 2.18
ln (GNU coreutils) 6.9
Comment 1 Alan Coopersmith 2009-08-03 20:01:16 UTC
kbd_mode was removed for the 1.6 release, so that part won't be fixed.

I've pushed the fix for the solaris*.il files to git master for the 1.7
release though:

 hw/xfree86/os-support/solaris/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5da9b255a64bec7dbf5ddb392d54dac9be5b43c0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Aug 3 19:53:27 2009 -0700

    Fix blddir != srcdir builds of solaris-*.il files
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17509
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index c09ae32..c7ac08b 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -14,7 +14,7 @@ SOLARIS_INOUT_SRC = solaris-@SOLARIS_INOUT_ARCH@.S
 DISTCLEANFILES = solaris-@SOLARIS_INOUT_ARCH@.il
 
 solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S
-	$(CPP) -P -DINLINE_ASM solaris-@SOLARIS_INOUT_ARCH@.S > $@
+	$(CPP) -P -DINLINE_ASM $(srcdir)/solaris-@SOLARIS_INOUT_ARCH@.S > $@
 
 noinst_LTLIBRARIES = libsolaris.la
 libsolaris_la_SOURCES = sun_init.c \


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.