SOURCES: splashutils-makefile.patch - updated.
pluto
pluto at pld-linux.org
Tue Jun 14 02:48:25 CEST 2005
Author: pluto Date: Tue Jun 14 00:48:25 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated.
---- Files affected:
SOURCES:
splashutils-makefile.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/splashutils-makefile.patch
diff -u SOURCES/splashutils-makefile.patch:1.4 SOURCES/splashutils-makefile.patch:1.5
--- SOURCES/splashutils-makefile.patch:1.4 Mon Jun 13 19:54:46 2005
+++ SOURCES/splashutils-makefile.patch Tue Jun 14 02:48:20 2005
@@ -1,21 +1,22 @@
--- splashutils-1.1.9.6/Makefile.orig 2005-05-15 20:39:25.000000000 +0200
-+++ splashutils-1.1.9.6/Makefile 2005-06-13 19:51:52.000000000 +0200
-@@ -9,14 +9,6 @@
++++ splashutils-1.1.9.6/Makefile 2005-06-14 02:40:44.000000000 +0200
+@@ -8,15 +8,11 @@
+ #
PKG_VERSION = 1.1.9.6
- DEBUG = false # set to true to prevent stripping
+-DEBUG = false # set to true to prevent stripping
-K_SHARED = false # set to true if you want to link to a shared klibc
--QUIET = true
--
--JPEGSRC = libs/jpeg-6b
--LPNGSRC = libs/libpng-1.2.8
+ QUIET = true
+
+ JPEGSRC = libs/jpeg-6b
+ LPNGSRC = libs/libpng-1.2.8
-ZLIBSRC = libs/zlib-1.2.1
--FT2SRC = libs/freetype-2.1.9
+ FT2SRC = libs/freetype-2.1.9
-LIBCSRC = libs/klibc-1.0.8/klibc
prefix =
sbindir = ${prefix}/sbin
-@@ -28,89 +20,26 @@
+@@ -28,38 +24,13 @@
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROG}
@@ -28,20 +29,21 @@
- CRT0 = $(LIBCSRC)/crt0.o
- K_LDFLAGS = --gc-sections
-endif
--
+
-ifeq ($(strip $(QUIET)),true)
- OUTPUT = /dev/null
-else
- OUTPUT = /dev/stdout
-endif
--
- LIBGCC = $(shell $(CC) --print-libgcc)
- ROOT = $(shell pwd)
- ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
++ OUTPUT = /dev/stdout
--include $(LIBCSRC)/arch/$(ARCH)/MCONFIG
+-LIBGCC = $(shell $(CC) --print-libgcc)
+ ROOT = $(shell pwd)
+-ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-
--# flags for the kernel utils
+-include $(LIBCSRC)/arch/$(ARCH)/MCONFIG
+
+ # flags for the kernel utils
-K_CFLAGS = -w $(shell grep REQFLAGS $(LIBCSRC)/../klibc.config | cut -d= -f2-) \
- $(shell grep OPTFLAGS $(LIBCSRC)/../klibc.config | cut -d= -f2-) \
- -I${ROOT}/$(LIBCSRC)/../include/arch/$(ARCH) \
@@ -51,78 +53,66 @@
- -I${ROOT}/linux/include2 \
- $(MISCINCS) \
- -DWITH_ERRLIST -I${ROOT}/$(ZLIBSRC) -I${ROOT}/$(FT2SRC)/include -I/usr/include -ffunction-sections \
-- -fdata-sections -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
--
--PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \
-- -DPNG_LEGACY_SUPPORTED -DPNG_NO_PROGRESSIVE_READ -DPNG_NO_MNG_FEATURES -DPNG_NO_CONSOLE_IO \
-- -DPNG_NO_ERROR_NUMBERS -DPNG_READ_GRAY_TO_RGB_SUPPORTED -DPNG_READ_16_TO_8_SUPPORTED \
-- -DPNG_READ_STRIP_ALPHA_SUPPORTED -DPNG_NO_INFO_IMAGE -DPNG_NO_READ_TRANSFORMS -DPNG_NO_READ_ANCILLARY_CHUNKS
--
++K_CFLAGS = -I$(FT2SRC)/include -I/usr/include -ffunction-sections \
+ -fdata-sections -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+ PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \
+@@ -67,16 +38,15 @@
+ -DPNG_NO_ERROR_NUMBERS -DPNG_READ_GRAY_TO_RGB_SUPPORTED -DPNG_READ_16_TO_8_SUPPORTED \
+ -DPNG_READ_STRIP_ALPHA_SUPPORTED -DPNG_NO_INFO_IMAGE -DPNG_NO_READ_TRANSFORMS -DPNG_NO_READ_ANCILLARY_CHUNKS
+
-K_LDLIBS = $(JPEGSRC)/libjpeg.a
--K_OBJS = $(KOUT)/kernel.o $(KOUT)/dev.o $(KOUT)/parse.o $(KOUT)/render.o $(KOUT)/image.o \
-- $(KOUT)/cmd.o $(KOUT)/common.o $(KOUT)/list.o $(KOUT)/effects.o
--K_DEPS =
--
++K_LDLIBS = $(JPEGSRC)/libjpeg.a
+ K_OBJS = $(KOUT)/kernel.o $(KOUT)/dev.o $(KOUT)/parse.o $(KOUT)/render.o $(KOUT)/image.o \
+ $(KOUT)/cmd.o $(KOUT)/common.o $(KOUT)/list.o $(KOUT)/effects.o
+ K_DEPS =
+
# flags for the user utils
-CFLAGS = -Wall -g
--LDLIBS = -ljpeg -lm
-+CFLAGS = -Wall
-+LDLIBS = -ljpeg -lpng -lm -lfreetype -lz
+ LDLIBS = -ljpeg -lm
LDFLAGS =
-INCLUDES = -I${ROOT}/linux/include -I/usr/include/freetype2
--OBJS = splash.o parse.o render.o image.o cmd.o common.o daemon.o list.o effects.o
-+INCLUDES = -I/usr/include/freetype2
-+OBJS = splash.o parse.o render.o image.o cmd.o common.o daemon.o list.o effects.o ttf.o
++INCLUDES = -I/usr/linux/include -I/usr/include/freetype2
+ OBJS = splash.o parse.o render.o image.o cmd.o common.o daemon.o list.o effects.o
# checks whether an opton is set in config.h
- config_opt = $(shell if [[ -n "`egrep '^\#define[[:space:]]+$(1)([[:space:]]+|$$)' config.h`" ]]; then echo true ; fi)
+@@ -99,16 +69,12 @@
+ endif
--ifeq ($(call config_opt,CONFIG_TTF),true)
-- OBJS += ttf.o
-- LDLIBS += -lfreetype -lz
--endif
--
--ifeq ($(call config_opt,CONFIG_MNG),true)
-- OBJS += mng_render.o mng_callbacks.o
-- LDLIBS += -lmng -llcms -ljpeg -lz
--endif
--
--ifeq ($(call config_opt,CONFIG_TTF_KERNEL),true)
-- K_LDLIBS += $(FT2SRC)/objs/.libs/libfreetype.a
-- K_OBJS += $(KOUT)/ttf.o
-- K_DEPS += ft2
--endif
--
--ifeq ($(call config_opt,CONFIG_PNG),true)
+ ifeq ($(call config_opt,CONFIG_PNG),true)
- K_LDLIBS += $(LPNGSRC)/libpng.a $(ZLIBSRC)/libz.a
-- K_DEPS += libpng
-- LDLIBS += -lpng -lz -lm
--endif
--
- ifeq ($(strip $(DEBUG)),true)
- STRIP = true
- else
++ K_LDLIBS += $(LPNGSRC)/libpng.a -lz
+ K_DEPS += libpng
+ LDLIBS += -lpng -lz -lm
+ endif
+
+-ifeq ($(strip $(DEBUG)),true)
+- STRIP = true
+-else
STRIP = strip --strip-all -R .comment -R .note
- endif
+-endif
--KOUT = kernel
+ KOUT = kernel
dotg = \e[32;01m*\e[0m
- info = printf " %-7s %s\n" $(1) $(2)
- install_script = $(call info,INSTALL,$(1)) ; $(INSTALL_PROG) -D scripts/$(1) $(DESTDIR)$(usrbindir)/$(1) ; \
-@@ -134,102 +63,18 @@
- @$(CC) $+ $(LDLIBS) -o $@
- @$(CC) $+ $(LDLIBS) -static -o $@.static
+@@ -131,48 +97,21 @@
+ $(SP_UTIL): $(OBJS)
+ @$(call info,LD,$@)
+- @$(CC) $+ $(LDLIBS) -o $@
+- @$(CC) $+ $(LDLIBS) -static -o $@.static
+-
-linux:
- @if [ ! -e "$(ROOT)/linux" ]; then \
- ln -s /lib/modules/`uname -r`/source/ "$(ROOT)/linux"; \
- fi
--
--kdir:
-- @if [ ! -d "$(ROOT)/$(KOUT)" ]; then \
-- mkdir "$(ROOT)/$(KOUT)" ; \
-- fi
--
++ $(CC) $+ $(LDLIBS) -o $@
++ $(CC) $+ $(LDLIBS) -static -o $@.static
+
+ kdir:
+ @if [ ! -d "$(ROOT)/$(KOUT)" ]; then \
+ mkdir "$(ROOT)/$(KOUT)" ; \
+ fi
+
-klibc: linux
- @if [ ! -e linux ]; then \
- echo "The 'linux' symlink does not exist!" ; \
@@ -145,43 +135,26 @@
- make libz.a > $(OUTPUT)
-
-libpng: zlib config.h
-- @cd $(LPNGSRC) ; \
-- if [ ! -e ./Makefile ]; then \
-- $(call info,CONF,libpng) ; \
-- cp scripts/makefile.linux Makefile > $(OUTPUT); \
-- sed -i -e '/^CFLAGS/ { N ; s#^CFLAGS=.*#CFLAGS=$(K_CFLAGS) $(PNGDEFS)# ; P ; D }' \
++libpng: config.h
+ @cd $(LPNGSRC) ; \
+ if [ ! -e ./Makefile ]; then \
+ $(call info,CONF,libpng) ; \
+ cp scripts/makefile.linux Makefile > $(OUTPUT); \
+ sed -i -e '/^CFLAGS/ { N ; s#^CFLAGS=.*#CFLAGS=$(K_CFLAGS) $(PNGDEFS)# ; P ; D }' \
- -e 's#^ZLIBINC=.*#ZLIBINC=$(ZLIBSRC)#' \
- -e 's#^ZLIBLIB=.*#ZLIBLIB=$(ZLIBSRC)#' Makefile ; \
-- fi ; \
-- if ! make -q libpng.a; then $(call info,MAKE,libpng) ; fi ; \
-- make libpng.a > $(OUTPUT)
--
--jpeglib:
-- @cd $(JPEGSRC) ; \
-- if [ ! -e ./Makefile ]; then \
-- $(call info,CONF,libjpeg) ; \
-- ./configure > $(OUTPUT) ; \
-- echo "#define NO_GETENV 1" >> jconfig.h ; \
-- sed -i "s#CFLAGS=.*#CFLAGS=$(K_CFLAGS)#" Makefile ; \
-- sed -i "s:#define JMESSAGE.*::" jerror.c ; \
-- fi ; \
-- if ! make -q libjpeg.a; then $(call info,MAKE,libjpeg) ; fi ; \
-- make libjpeg.a > $(OUTPUT)
--
--ft2: config.h
-- @cd $(FT2SRC) ; \
-- if [ ! -e ./config.mk ]; then \
-- $(call info,CONF,freetype2) ; \
-- ./configure --disable-shared > $(OUTPUT) ; \
-- fi ; \
-- if ! make -q library; then $(call info,MAKE,freetype2) ; fi ; \
-- make CFLAGS="-c $(K_CFLAGS)" library > $(OUTPUT)
--
++ Makefile ; \
+ fi ; \
+ if ! make -q libpng.a; then $(call info,MAKE,libpng) ; fi ; \
+ make libpng.a > $(OUTPUT)
+@@ -198,45 +137,28 @@
+ if ! make -q library; then $(call info,MAKE,freetype2) ; fi ; \
+ make CFLAGS="-c $(K_CFLAGS)" library > $(OUTPUT)
+
-splash_kern: klibc jpeglib kdir $(K_DEPS) $(SP_HELPER) $(LIBC) config.h $(K_LDLIBS)
-+splash_kern: $(SP_HELPER) config.h
++splash_kern: jpeglib kdir $(K_DEPS) $(SP_HELPER) $(LIBC) config.h $(K_LDLIBS)
--$(SP_HELPER): $(K_OBJS)
-+$(SP_HELPER): $(OBJS)
+ $(SP_HELPER): $(K_OBJS)
@$(call info,LD,$@)
-ifeq ($(strip $(K_SHARED)),true)
- @ld $(K_LDFLAGS) -o $@ -e main $(CRT0) $+ $(K_LDLIBS) -R $(LIBC) $(LIBGCC)
@@ -194,16 +167,16 @@
- @echo ld $(K_LDFLAGS) -o $@ $(CRT0) $+ $(K_LDLIBS) $(LIBC) $(LIBGCC)
-endif
-endif
-+ ld $(LDFLAGS) -o $@ $(CRT0) $+ $(LDLIBS) $(LIBC) $(LIBGCC)
++ @$(CC) -static $(K_LDFLAGS) -o $@ $+ $(K_LDLIBS)
@$(STRIP) $@
--$(KOUT)/%.o: %.c config.h splash.h
-- @$(call info,CC,$@)
-- @$(CC) $(K_CFLAGS) -c -o $@ $<
+ $(KOUT)/%.o: %.c config.h splash.h
+ @$(call info,CC,$@)
+ @$(CC) $(K_CFLAGS) -c -o $@ $<
-ifeq ($(strip $(QUIET)),false)
- @echo $(CC) $(K_CFLAGS) -c -o $@ $<
-endif
--
+
%.o: %.c config.h splash.h
@$(call info,CC,$@)
@$(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $<
@@ -212,30 +185,21 @@
-endif
-clean: clean_klibc clean_jpg clean_png clean_zlib clean_ft2 clean_splash
-+clean: clean_splash
++clean: clean_jpg clean_png clean_ft2 clean_splash
clean_splash:
@$(call info,CLEAN,splash)
-@@ -238,43 +83,6 @@
+ @rm -f *.o
+ @rm -f kernel/*.o
@rm -f splash_helper splash_util splash_util.static
- @rm -f linux
+- @rm -f linux
+
+ clean_jpg:
+ @cd $(JPEGSRC) ; \
+@@ -254,14 +176,6 @@
+ rm Makefile ; \
+ fi
--clean_jpg:
-- @cd $(JPEGSRC) ; \
-- if [ -e Makefile ]; then \
-- $(call info,CLEAN,libjpeg) ; \
-- make clean > $(OUTPUT) ; \
-- rm Makefile ; \
-- fi
--
--clean_png:
-- @cd $(LPNGSRC) ; \
-- if [ -e Makefile ]; then \
-- $(call info,CLEAN,libpng) ; \
-- make clean > $(OUTPUT) ; \
-- rm Makefile ; \
-- fi
--
-clean_zlib:
- @cd $(ZLIBSRC) ; \
- if [ -e Makefile ]; then \
@@ -244,14 +208,13 @@
- rm Makefile ; \
- fi
-
--clean_ft2:
-- @cd $(FT2SRC) ; \
-- if [ -e ./config.mk ]; then \
-- $(call info,CLEAN,freetype2) ; \
-- make clean > $(OUTPUT) ; \
-- rm config.mk ; \
-- fi
--
+ clean_ft2:
+ @cd $(FT2SRC) ; \
+ if [ -e ./config.mk ]; then \
+@@ -270,11 +184,6 @@
+ rm config.mk ; \
+ fi
+
-clean_klibc:
- @cd $(LIBCSRC) ; \
- $(call info,CLEAN,klibc) ; \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/splashutils-makefile.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list