GD und gd Konflikt gelöst...

make.sh zerstört :(

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@52 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/gd b/lfs/gd
new file mode 100644 (file)
index 0000000..b9cc599
--- /dev/null
+++ b/lfs/gd
@@ -0,0 +1,89 @@
+###############################################################################\r
+# This file is part of the IPCop Firewall.                                    #\r
+#                                                                             #\r
+# IPCop is free software; you can redistribute it and/or modify               #\r
+# it under the terms of the GNU General Public License as published by        #\r
+# the Free Software Foundation; either version 2 of the License, or           #\r
+# (at your option) any later version.                                         #\r
+#                                                                             #\r
+# IPCop is distributed in the hope that it will be useful,                    #\r
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #\r
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #\r
+# GNU General Public License for more details.                                #\r
+#                                                                             #\r
+# You should have received a copy of the GNU General Public License           #\r
+# along with IPCop; if not, write to the Free Software                        #\r
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #\r
+#                                                                             #\r
+# Makefiles are based on LFSMake, which is                                    #\r
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #\r
+#                                                                             #\r
+# Modifications by:                                                           #\r
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #\r
+#          - Modified Makefile for IPCop build                                #\r
+#                                                                             #\r
+# $Id: gd,v 1.5.2.4 2005/03/04 19:26:50 gespinasse Exp $\r
+#                                                                             #\r
+###############################################################################\r
+\r
+###############################################################################\r
+# Definitions\r
+###############################################################################\r
+\r
+include Config\r
+\r
+VER        = 2.0.20\r
+\r
+THISAPP    = gd-$(VER)\r
+DL_FILE    = $(THISAPP).tar.gz\r
+DL_FROM    = http://www.boutell.com/gd/http\r
+DIR_APP    = $(DIR_SRC)/$(THISAPP)\r
+TARGET     = $(DIR_INFO)/$(THISAPP)\r
+\r
+###############################################################################\r
+# Top-level Rules\r
+###############################################################################\r
+\r
+objects = $(DL_FILE)\r
+\r
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)\r
+\r
+$(DL_FILE)_MD5 = 3e513bf438a8d797b508a4fbf52c9bd1\r
+\r
+install : $(TARGET)\r
+\r
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))\r
+\r
+download :$(patsubst %,$(DIR_DL)/%,$(objects))\r
+\r
+md5 : $(subst %,%_MD5,$(objects))\r
+\r
+###############################################################################\r
+# Downloading, checking, md5sum\r
+###############################################################################\r
+\r
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :\r
+       @$(CHECK)\r
+\r
+$(patsubst %,$(DIR_DL)/%,$(objects)) :\r
+       @$(LOAD)\r
+\r
+$(subst %,%_MD5,$(objects)) :\r
+       @$(MD5)\r
+\r
+###############################################################################\r
+# Installation Details\r
+###############################################################################\r
+\r
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))\r
+       @$(PREBUILD)\r
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)\r
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls\r
+       cd $(DIR_APP) && sed -i \\r
+           -e 's%^#include "jpeglib.h".*$$%%' \\r
+           -e 's%^#include "jerror.h".*$$%%' gd_jpeg.c\r
+       cd $(DIR_APP) && make\r
+       cd $(DIR_APP) && make install\r
+       @rm -rf $(DIR_APP)\r
+       @$(POSTBUILD)\r
+\r

diff --git a/lfs/perl-GD b/lfs/perl-GD
new file mode 100644 (file)
index 0000000..519ae5e
--- /dev/null
+++ b/lfs/perl-GD
@@ -0,0 +1,88 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop is free software; you can redistribute it and/or modify               #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation; either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop is distributed in the hope that it will be useful,                    #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+# Modifications by:                                                           #
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
+#          - Modified Makefile for IPCop build                                #
+#                                                                             #
+# $Id: gd,v 1.5.2.4 2005/03/04 19:26:50 gespinasse Exp $
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.0.20
+
+THISAPP    = gd-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://www.boutell.com/gd/http
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3e513bf438a8d797b508a4fbf52c9bd1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && sed -i \
+           -e 's%^#include "jpeglib.h".*$$%%' \
+           -e 's%^#include "jerror.h".*$$%%' gd_jpeg.c
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 9f4b92197a0c76862fb19b69678901eaae986594..ae549013520bdab751c316cb1758c5065b7a037d 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -568,7 +568,7 @@ buildipcop() {
   ipcopmake ethtool
   ipcopmake ez-ipupdate
   ipcopmake fcron
-  ipcopmake GD
+  ipcopmake perl-GD
   ipcopmake gnupg
   ipcopmake hdparm
   ipcopmake ibod