Alejandro Mery
17 years ago
3 changed files with 0 additions and 80 deletions
@ -1,27 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../libjpeg/libtool-fix.patch
|
|
||||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
diff -Naur jpeg-6b.orig/configure jpeg-6b/configure
|
|
||||||
--- jpeg-6b.orig/configure 1998-03-21 21:08:57.000000000 +0200
|
|
||||||
+++ jpeg-6b/configure 2005-02-25 09:46:23.987965024 +0200
|
|
||||||
@@ -1529,7 +1529,7 @@
|
|
||||||
|
|
||||||
if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then
|
|
||||||
USELIBTOOL="yes"
|
|
||||||
- LIBTOOL="./libtool"
|
|
||||||
+ LIBTOOL="libtool"
|
|
||||||
O="lo"
|
|
||||||
A="la"
|
|
||||||
LN='$(LIBTOOL) --mode=link $(CC)'
|
|
@ -1,49 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../libjpeg/libtool-tag.patch
|
|
||||||
# Copyright (C) 2006 The OpenSDE Project
|
|
||||||
#
|
|
||||||
# More information can be found in the files COPYING and README.
|
|
||||||
#
|
|
||||||
# This patch file is dual-licensed. It is available under the license the
|
|
||||||
# patched project is licensed under, as long as it is an OpenSource license
|
|
||||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
libtool can't understand what our $(CC) is, let's help him.
|
|
||||||
|
|
||||||
--- ./makefile.cfg.orig 2006-09-24 09:07:04.000000000 +0200
|
|
||||||
+++ ./makefile.cfg 2006-09-24 09:17:23.000000000 +0200
|
|
||||||
@@ -140,7 +140,7 @@
|
|
||||||
|
|
||||||
# How to compile with libtool.
|
|
||||||
@COM_LT@.c.lo:
|
|
||||||
-@COM_LT@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c
|
|
||||||
+@COM_LT@ $(LIBTOOL) --mode=compile --tag CC $(CC) $(CFLAGS) -c $(srcdir)/$*.c
|
|
||||||
|
|
||||||
# How to use ansi2knr, when not using libtool.
|
|
||||||
@COM_A2K@.c.o:
|
|
||||||
@@ -168,7 +168,7 @@
|
|
||||||
|
|
||||||
# with libtool:
|
|
||||||
libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
|
|
||||||
- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
|
|
||||||
+ $(LIBTOOL) --mode=link --tag CC $(CC) -o libjpeg.la $(LIBOBJECTS) \
|
|
||||||
-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
|
|
||||||
|
|
||||||
# sample programs:
|
|
||||||
--- ./configure.orig 2006-09-24 09:34:05.000000000 +0200
|
|
||||||
+++ ./configure 2006-09-24 09:34:27.000000000 +0200
|
|
||||||
@@ -1532,7 +1532,7 @@
|
|
||||||
LIBTOOL="libtool"
|
|
||||||
O="lo"
|
|
||||||
A="la"
|
|
||||||
- LN='$(LIBTOOL) --mode=link $(CC)'
|
|
||||||
+ LN='$(LIBTOOL) --mode=link --tag CC $(CC)'
|
|
||||||
INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
|
|
||||||
INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
|
|
||||||
else
|
|
Loading…
Reference in new issue