Re: Radeon M7 and resuming from suspend-to-ram

[Carl-Daniel Hailfinger <c-d.hailfinger.devel.2005-hi6Y0CQ0nG0@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]

Carl-Daniel Hailfinger schrieb:
> Ralf Gerbig schrieb:
> 
>>SuSE does not have a shared libpci, only static so the precompiled
>>binary unsurprisingly did not work.
>>
>>Compiling the source I got: 
>>
>>rge@lapdog2:/usr/src/vbetool-0.2> make
>>if gcc -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" 
>>-DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"vbetool\" 
>>-DVERSION=\"0.2\"  -I. -I.    
>>-g -Wall -Werror -pedantic -g -O2 -MT vbetool.o -MD -MP -MF ".deps/vbetool.Tpo" \
>>  -c -o vbetool.o `test -f 'vbetool.c' || echo './'`vbetool.c; \
>>then mv -f ".deps/vbetool.Tpo" ".deps/vbetool.Po"; \
>>else rm -f ".deps/vbetool.Tpo"; exit 1; \
>>fi
>>In file included from /usr/include/stdlib.h:416,
>>                 from vbetool.c:14:
>>/usr/include/sys/types.h:62: error: conflicting types for `dev_t'
>>/usr/include/linux/types.h:22: error: previous declaration of `dev_t'
>>[...]
> 
> 
> Yes, the pci.h shipped by SUSE has problems. Simply move the #include
> <pci/pci.h> from the beginning to directly before #include <sys/kd.h>
> 
>>after fuzing around with -D, I temporally commented out the
>>include. Thereafter adding -lpci to the end of the link command, I got
>>a working executable.

Matthew, could you apply attached patch and run aclocal, autoconf and
automake again? This will fix the compile problems on SUSE 9.2.


Regards,
Carl-Daniel
-- 
http://www.hailfinger.org/

[-- Attachment #2: vbetool-fix.diff --]
[-- Type: text/x-patch, Size: 848 bytes --]

diff -urN vbetool-0.2/Makefile.am vbetool-0.2-modified/Makefile.am
--- vbetool-0.2/Makefile.am	2004-12-30 16:27:07.000000000 +0100
+++ vbetool-0.2-modified/Makefile.am	2005-02-03 21:58:16.000000000 +0100
@@ -12,4 +12,4 @@
 	$(RM) Makefile.in aclocal.m4 config.h.in stamp-h.in configure
 
 AM_CFLAGS = -g -Wall -Werror -pedantic
-AM_LDFLAGS = -lpci
+LIBS = -lpci
diff -urN vbetool-0.2/vbetool.c vbetool-0.2-modified/vbetool.c
--- vbetool-0.2/vbetool.c	2004-12-31 16:11:19.000000000 +0100
+++ vbetool-0.2-modified/vbetool.c	2005-02-03 22:02:53.000000000 +0100
@@ -8,7 +8,6 @@
 version 2
 */
 
-#include <pci/pci.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,6 +16,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/io.h>
+#include <pci/pci.h>
 #include <sys/kd.h>
 #include <sys/stat.h>
 #include <errno.h>