SOURCES: suspend-build.patch - updated

arekm arekm at pld-linux.org
Mon Feb 5 10:01:12 CET 2007 

Author: arekm                        Date: Mon Feb  5 09:01:12 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   suspend-build.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/suspend-build.patch
diff -u SOURCES/suspend-build.patch:1.3 SOURCES/suspend-build.patch:1.4
--- SOURCES/suspend-build.patch:1.3	Tue Jan 16 09:23:14 2007
+++ SOURCES/suspend-build.patch	Mon Feb  5 10:01:04 2007
@@ -1,100 +1,21 @@
 diff -urN suspend.org/Makefile suspend/Makefile
---- suspend.org/Makefile	2007-01-16 09:12:35.000000000 +0100
-+++ suspend/Makefile	2007-01-16 09:22:17.000000000 +0100
-@@ -9,6 +9,7 @@
- LD_FLAGS=-L/usr/local/lib
+--- suspend.org/Makefile	2007-02-05 09:52:51.000000000 +0100
++++ suspend/Makefile	2007-02-05 09:57:47.387659171 +0100
+@@ -25,7 +26,7 @@
+ S2RAM_OBJ=vt.o vbetool/x86-common.o vbetool/vbetool.o radeontool.o dmidecode.o
+ SWSUSP_OBJ=vt.o md5.o encrypt.o config.o loglevel.o splash.o bootsplash.o 
+ 
+-S2RAM_LD_FLAGS = $(LD_FLAGS) -lpci
++S2RAM_LD_FLAGS = $(LD_FLAGS) -lpci -lz
+ SWSUSP_LD_FLAGS = $(LD_FLAGS)
  
- CFLAGS := -O2 -Wall
-+LDFLAGS :=
- 
- ifdef CONFIG_COMPRESS
- CC_FLAGS	+= -DCONFIG_COMPRESS
-@@ -67,7 +68,7 @@
- 	rm -f $(S2DISK) $(S2BOTH) swap-offset suspend-keygen suspend.keys resume s2ram *.o vbetool/*.o vbetool/x86emu/*.o vbetool/x86emu/*.a
- 
- s2ram:	s2ram.c dmidecode.c whitelist.c radeontool.c $(S2RAMOBJ)
--	$(CC) $(CFLAGS) -g s2ram.c $(S2RAMOBJ) -lpci -o s2ram
-+	$(CC) $(CFLAGS) $(LDFLAGS) -g s2ram.c $(S2RAMOBJ) -lpci -lz -o s2ram
- 
- vbetool/vbetool.o:	vbetool/vbetool.c
- 	$(CC) $(CFLAGS) -DS2RAM -c vbetool/vbetool.c -o vbetool/vbetool.o
-@@ -79,7 +80,7 @@
- 	$(CC) $(CFLAGS) -c vbetool/x86-common.c -o vbetool/x86-common.o
+ ifeq ($(ARCH), x86_64)
+@@ -81,7 +82,7 @@
  
+ #### Rules for objects
  vbetool/x86emu/libx86emu.a:
 -	make -C vbetool/x86emu -f makefile.linux
 +	$(MAKE) -C vbetool/x86emu -f makefile.linux
  
- vbetool/thunk.o:	vbetool/thunk.c
- 	$(CC) $(CFLAGS) -c vbetool/thunk.c -o vbetool/thunk.o
-@@ -112,16 +113,16 @@
- 	$(CC) -g $(CFLAGS) $(CC_FLAGS) -c $< -o $@
- 
- $(S2DISK):	vt.o md5.o encrypt.o config.o suspend.c swsusp.h config.h encrypt.h md5.h $(SPLASHOBJ)
--	$(CC) -g $(CFLAGS) $(CC_FLAGS) vt.o md5.o encrypt.o config.o suspend.c -o $@ $(SPLASHOBJ) $(LD_FLAGS)
-+	$(CC) -g $(CFLAGS) $(CC_FLAGS) $(LDFLAGS) vt.o md5.o encrypt.o config.o suspend.c -o $@ $(SPLASHOBJ) $(LD_FLAGS)
- 
- $(S2BOTH):	md5.o encrypt.o config.o suspend.c swsusp.h config.h encrypt.h md5.h s2ram.c dmidecode.c whitelist.c radeontool.c $(S2RAMOBJ) $(SPLASHOBJ)
--	$(CC) -g $(CFLAGS) -DCONFIG_BOTH $(CC_FLAGS) md5.o encrypt.o config.o suspend.c s2ram.c -o $@ $(S2RAMOBJ) $(SPLASHOBJ) $(LD_FLAGS) -lpci
-+	$(CC) -g $(CFLAGS) -DCONFIG_BOTH $(CC_FLAGS) $(LDFLAGS) md5.o encrypt.o config.o suspend.c s2ram.c -o $@ $(S2RAMOBJ) $(SPLASHOBJ) $(LD_FLAGS) -lpci -lz
- 
- resume:	md5.o encrypt.o config.o resume.c swsusp.h config.h encrypt.h md5.h $(SPLASHOBJ)
--	$(CC) $(CFLAGS) $(CC_FLAGS) $(STATIC_CC_FLAGS) md5.o encrypt.o config.o vt.o resume.c $(SPLASHOBJ) -static -o resume $(LD_FLAGS) $(STATIC_LD_FLAGS)
-+	$(CC) $(CFLAGS) $(CC_FLAGS) $(STATIC_CC_FLAGS) $(LDFLAGS) md5.o encrypt.o config.o vt.o resume.c $(SPLASHOBJ) -static -o resume $(LD_FLAGS) $(STATIC_LD_FLAGS)
- 
- swap-offset: swap-offset.c
--	$(CC) $(CFLAGS) swap-offset.c -o swap-offset
-+	$(CC) $(CFLAGS) $(LDFLAGS) swap-offset.c -o swap-offset
- 
- ifdef CONFIG_ENCRYPT
- suspend-keygen:	md5.o keygen.c encrypt.h md5.h
-diff -urN suspend.org/suspend-build.patch suspend/suspend-build.patch
---- suspend.org/suspend-build.patch	1970-01-01 01:00:00.000000000 +0100
-+++ suspend/suspend-build.patch	2006-11-13 09:25:33.000000000 +0100
-@@ -0,0 +1,46 @@
-+diff -urN suspend-0.5.org/Makefile suspend-0.5/Makefile
-+--- suspend-0.5.org/Makefile	2006-11-12 15:43:54.000000000 +0100
-++++ suspend-0.5/Makefile	2006-11-13 09:25:27.000000000 +0100
-+@@ -9,6 +9,7 @@
-+ LD_FLAGS=-L/usr/local/lib
-+ 
-+ CFLAGS := -O2 -Wall
-++LDFLAFS :=
-+ 
-+ ifdef CONFIG_COMPRESS
-+ CC_FLAGS	+= -DCONFIG_COMPRESS
-+@@ -66,7 +67,7 @@
-+ 	rm -f $(S2DISK) $(S2BOTH) swap-offset suspend-keygen suspend.keys resume s2ram *.o vbetool/*.o vbetool/x86emu/*.o vbetool/x86emu/*.a
-+ 
-+ s2ram:	s2ram.c dmidecode.c whitelist.c radeontool.c $(S2RAMOBJ)
-+-	$(CC) $(CFLAGS) -g s2ram.c $(S2RAMOBJ) -lpci -o s2ram
-++	$(CC) $(CFLAGS) $(LDFLAGS) s2ram.c $(S2RAMOBJ) -lpci -lz -o s2ram
-+ 
-+ vbetool/vbetool.o:	vbetool/vbetool.c
-+ 	$(CC) $(CFLAGS) -DS2RAM -c vbetool/vbetool.c -o vbetool/vbetool.o
-+@@ -111,20 +112,20 @@
-+ 	$(CC) -g $(CFLAGS) $(CC_FLAGS) -c $< -o $@
-+ 
-+ $(S2DISK):	vt.o md5.o encrypt.o config.o suspend.c swsusp.h config.h encrypt.h md5.h $(SPLASHOBJ)
-+-	$(CC) -g $(CFLAGS) $(CC_FLAGS) vt.o md5.o encrypt.o config.o suspend.c -o $@ $(SPLASHOBJ) $(LD_FLAGS)
-++	$(CC) -g $(CFLAGS) $(CC_FLAGS) $(LDFLAGS) vt.o md5.o encrypt.o config.o suspend.c -o $@ $(SPLASHOBJ) $(LD_FLAGS)
-+ 
-+ $(S2BOTH):	md5.o encrypt.o config.o suspend.c swsusp.h config.h encrypt.h md5.h s2ram.c dmidecode.c whitelist.c radeontool.c $(S2RAMOBJ) $(SPLASHOBJ)
-+-	$(CC) -g $(CFLAGS) -DCONFIG_BOTH $(CC_FLAGS) md5.o encrypt.o config.o suspend.c s2ram.c -o $@ $(S2RAMOBJ) $(SPLASHOBJ) $(LD_FLAGS) -lpci
-++	$(CC) -g $(CFLAGS) -DCONFIG_BOTH $(CC_FLAGS) $(LDFLAGS) md5.o encrypt.o config.o suspend.c s2ram.c -o $@ $(S2RAMOBJ) $(SPLASHOBJ) $(LD_FLAGS) -lpci -lz
-+ 
-+ resume:	md5.o encrypt.o config.o resume.c swsusp.h config.h encrypt.h md5.h $(SPLASHOBJ)
-+-	$(CC) $(CFLAGS) $(CC_FLAGS) $(STATIC_CC_FLAGS) md5.o encrypt.o config.o vt.o resume.c $(SPLASHOBJ) -static -o resume $(LD_FLAGS) $(STATIC_LD_FLAGS)
-++	$(CC) $(CFLAGS) $(CC_FLAGS) $(STATIC_CC_FLAGS) md5.o encrypt.o config.o vt.o resume.c $(SPLASHOBJ) -static -o resume $(LD_FLAGS) $(STATIC_LD_FLAGS) $(LDFLAGS)
-+ 
-+ swap-offset: swap-offset.c
-+-	$(CC) swap-offset.c -o swap-offset
-++	$(CC) swap-offset.c -o swap-offset $(LDFLAGS)
-+ 
-+ ifdef CONFIG_ENCRYPT
-+ suspend-keygen:	md5.o keygen.c encrypt.h md5.h
-+-	$(CC) $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_STDINT_H $(CC_FLAGS) md5.o keygen.c -o suspend-keygen $(LD_FLAGS)
-++	$(CC) $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_STDINT_H $(CC_FLAGS) md5.o keygen.c -o suspend-keygen $(LD_FLAGS) $(LDFLAGS)
-+ 
-+ install-s2disk: $(S2DISK) suspend-keygen swap-offset conf/$(CONFIGFILE) $(SNAPSHOT)
-+ 	install --mode=755 suspend-keygen $(DESTDIR)$(SUSPEND_DIR)
+ s2ram-both.o: s2ram.c s2ram.h whitelist.c
+ 	$(CC) $(CC_FLAGS) -DCONFIG_BOTH -c $< -o $@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/suspend-build.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list