Attachment 20 Details for Bug 28 – Update fontconfig to use libtool to build shared libraries

[patch] Update fontconfig to use libtool to build shared libraries

a (text/plain), 7.83 KB, created by bugzilla-fontconfig on 2003-02-14 04:27:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bugzilla-fontconfig

Created: 2003-02-14 04:27:56 UTC

Size: 7.83 KB

patch

obsolete

>--- fontconfig/configure.in.orig	Tue Dec 17 14:53:56 2002
>+++ fontconfig/configure.in	Wed Feb 12 17:47:18 2003
>@@ -34,7 +34,7 @@
> AC_ARG_WITH(expat,             [  --with-expat=DIR              Use Expat in DIR], expat=$withval, expat=yes)
> AC_ARG_WITH(expat_includes,    [  --with-expat-includes=DIR     Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes)
> AC_ARG_WITH(expat_lib,         [  --with-expat-lib=DIR          Use Expat library in DIR], expat_lib=$withval, expat_lib=yes)
>-AC_ARG_WITH(default_fonts,     [  --with-default-fonts=DIR      Use fonts from DIR when config is busted], defaultfonts="$withval", default_fonts=yes)
>+AC_ARG_WITH(default_fonts,     [  --with-default-fonts=DIR      Use fonts from DIR when config is busted], default_fonts="$withval", default_fonts=yes)
> AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store configuration files (default /etc/fonts)], confdir="$withval", confdir=yes)
> 
> # Checks for programs.
>@@ -46,21 +46,20 @@
> PACKAGE_VERSION=1.0.1
> 
> # Set major version
>-PACKAGE_MAJOR=`echo $PACKAGE_VERSION | awk -F . '{ print $1 }'`
>-PACKAGE_MINOR=`echo $PACKAGE_VERSION | awk -F . '{ print $2 }'`
>-PACKAGE_REVISION=`echo $PACKAGE_VERSION | awk -F . '{ print $3 }'`
>+PACKAGE_MAJOR=`echo $PACKAGE_VERSION | awk -F. '{ print $1 }'`
>+PACKAGE_MINOR=`echo $PACKAGE_VERSION | awk -F. '{ print $2 }'`
>+PACKAGE_REVISION=`echo $PACKAGE_VERSION | awk -F. '{ print $3 }'`
> AC_SUBST(PACKAGE_VERSION)
> AC_SUBST(PACKAGE_MAJOR)
> AC_SUBST(PACKAGE_MINOR)
> AC_SUBST(PACKAGE_REVISION)
> 
>-OBJEXT="o"
>-AC_SUBST(OBJEXT)
>-
> AC_DEFINE_UNQUOTED(PACKAGE_MAJOR,$PACKAGE_MAJOR)
> AC_DEFINE_UNQUOTED(PACKAGE_MINOR,$PACKAGE_MINOR)
> AC_DEFINE_UNQUOTED(PACKAGE_REVISION,$PACKAGE_REVISION)
>-	 
>+
>+AC_PROG_LIBTOOL
>+
> # Checks for header files.
> AC_HEADER_DIRENT
> AC_HEADER_STDC
>@@ -74,41 +73,16 @@
> AC_FUNC_VPRINTF
> AC_CHECK_FUNCS([memmove memset strchr strrchr strtol getopt getopt_long])
> 
>-if test "$GCC" = "yes"; then
>-    MKSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
>-    DSO_LDOPTS='-shared -Wl,-h,`echo $@ | sed '"'s/\.so\.$[[0-9][0-9]]*$.*/.so.\1/'"'`'
>-    DSO_CFLAGS=''
>-    DSO_PIC_CFLAGS='-fPIC -DPIC'
>-else
>-    AC_CANONICAL_HOST
>-    
>-    MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
>-    DSO_CFLAGS=''
>-    DSO_PIC_CFLAGS='-KPIC -DPIC'
>-    
>-    case "$host" in
>-    *solaris*)
>-    	DSO_LDOPTS='-G -z text -z defs -h $@'
>-	LIBS="$LIBS -lc"
>-	;;
>-    *)
>-    	DSO_LDOPTS='-shared -h $@'
>-    	;;
>-    esac
>-fi
>-
>-AC_SUBST(MKSHLIB)
>-AC_SUBST(DSO_LDOPTS)
>-AC_SUBST(DSO_CFLAGS)
>-AC_SUBST(DSO_PIC_CFLAGS)
>-
> #
> # Using x libraries, set X font directory
> case "$no_x" in
> yes)
> 	;;
> *)
>-	X_FONT_DIR="$x_libraries/X11/fonts"
>+	AC_ARG_WITH([x11-font-dir],
>+	AC_HELP_STRING([--with-x11-font-dir=DIR],
>+	[set default X11 font directory to DIR]),
>+	X_FONT_DIR=$withval, X_FONT_DIR="$x_libraries/X11/fonts")
> 	AC_DEFINE_UNQUOTED(X_FONT_DIR,$X_FONT_DIR)
> 	;;
> esac
>--- fontconfig/src/Makefile.in.orig	Tue Jan 28 16:27:34 2003
>+++ fontconfig/src/Makefile.in	Tue Jan 28 19:59:40 2003
>@@ -23,6 +23,7 @@
> #
> 
> TOPDIR=..
>+top_builddir=$(TOPDIR)
> 
> include $(TOPDIR)/config/Makedefs
> 
>@@ -48,73 +49,53 @@
>      fcstr.c \
>      fcxml.c
> 
>-OBJS=fcatomic.@OBJEXT@ \
>-     fcblanks.@OBJEXT@ \
>-     fccache.@OBJEXT@ \
>-     fccfg.@OBJEXT@ \
>-     fccharset.@OBJEXT@ \
>-     fcdbg.@OBJEXT@ \
>-     fcdefault.@OBJEXT@ \
>-     fcdir.@OBJEXT@ \
>-     fcfreetype.@OBJEXT@ \
>-     fcfs.@OBJEXT@ \
>-     fcinit.@OBJEXT@ \
>-     fclang.@OBJEXT@ \
>-     fclist.@OBJEXT@ \
>-     fcmatch.@OBJEXT@ \
>-     fcmatrix.@OBJEXT@ \
>-     fcname.@OBJEXT@ \
>-     fcpat.@OBJEXT@ \
>-     fcstr.@OBJEXT@ \
>-     fcxml.@OBJEXT@
>+OBJS=fcatomic.lo \
>+     fcblanks.lo \
>+     fccache.lo \
>+     fccfg.lo \
>+     fccharset.lo \
>+     fcdbg.lo \
>+     fcdefault.lo \
>+     fcdir.lo \
>+     fcfreetype.lo \
>+     fcfs.lo \
>+     fcinit.lo \
>+     fclang.lo \
>+     fclist.lo \
>+     fcmatch.lo \
>+     fcmatrix.lo \
>+     fcname.lo \
>+     fcpat.lo \
>+     fcstr.lo \
>+     fcxml.lo
> 
>-.c.@OBJEXT@:
>-	$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) -c $< -o $@
>+.SUFFIXES:
>+.SUFFIXES: .c .lo .o
>+
>+.c.o:
>+	$(CC) $(CFLAGS) -c $< -o $@
>+
>+.c.lo:
>+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o $@
> 	
>-all:: $(LIBFILE) $(LIBMAJOR) $(LIBBASE)
>+all:: $(LIBFILE)
> 
> # 
> # build the library and the various version links
> #
> $(LIBFILE): $(OBJS)
>-	rm -f $@
>-	$(MKSHLIB) $(OBJS) $(LIBS)
>-
>-$(LIBMAJOR): $(LIBFILE)
>-	rm -f  $@
>-	$(LN_S) $(LIBFILE) $(LIBMAJOR)
>-
>-$(LIBBASE): $(LIBMAJOR)
>-	rm -f $@
>-	$(LN_S) $(LIBMAJOR) $(LIBBASE)
>+	$(LIBTOOL) --mode=link $(CC) -o $@ -rpath $(libdir) \
>+	$(LIBVER) $(OBJS) $(LIBS)
> 
> $(OBJS): fcint.h $(HEADERS)
> 
>-#
>-# install directories
>-#
>-install:: $(DESTDIR)$(LIBDIR)
>-
>-$(DESTDIR)$(LIBDIR):
>-	mkdir -p $@
>-
> # 
> # install library
> #
> 
>-install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
>-install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
>-
>-$(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
>-	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)/$<
>-
>-$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
>-	rm -f $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
>-	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
>-
>-$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
>-	rm -f $(DESTDIR)$(LIBDIR)/$(LIBBASE)
>-	$(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
>+install: $(LIBFILE)
>+	$(mkinstalldirs) $(DESTDIR)$(LIBDIR)
>+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
> 
> clean::
> 	rm -f $(LIBFILE) $(LIBMAJOR) $(LIBBASE) $(OBJS)
>--- fontconfig/config/Makedefs.in.orig	Tue Jan 28 16:18:38 2003
>+++ fontconfig/config/Makedefs.in	Tue Jan 28 17:38:12 2003
>@@ -34,16 +34,13 @@
> sysconfdir=@sysconfdir@
> confdir=@confdir@
> 
>-DSO_LDOPTS=@DSO_LDOPTS@
>-DSO_CFLAGS=@DSO_CFLAGS@
>-DSO_PIC_CFLAGS=@DSO_PIC_CFLAGS@
>+LIBTOOL=@LIBTOOL@
> 
> INSTALL=@INSTALL@
> INSTALL_PROGRAM=@INSTALL_PROGRAM@
> INSTALL_SCRIPT=@INSTALL_SCRIPT@
> INSTALL_DATA=@INSTALL_DATA@
>-MKSHLIB=@MKSHLIB@
>-LN_S=@LN_S@
>+mkinstalldirs = $(SHELL) $(TOPDIR)/config/mkinstalldirs
> 
> # shared libraries
> LIBDIR=$(libdir)
>@@ -64,11 +61,10 @@
> 
> CFLAGS=$(CDEBUGFLAGS) @DEFS@ $(FCPATH_DEF) $(INCLUDES)
> 
>-LIBBASE=libfontconfig.so
>-LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
>-LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
>+LIBVER=-version-info 0:0:0
>+LIBFILE=libfontconfig.la
> 
>-LIBFONTCONFIG=-L$(SRCDIR) -lfontconfig
>+LIBFONTCONFIG=$(top_builddir)/src/$(LIBFILE)
> 
> SRCDIR=$(TOPDIR)/src
> 
>--- fontconfig/fc-cache/Makefile.in.orig	Tue Jan 28 17:06:21 2003
>+++ fontconfig/fc-cache/Makefile.in	Tue Jan 28 17:37:51 2003
>@@ -23,6 +23,7 @@
> #
> 
> TOPDIR=..
>+top_builddir=$(TOPDIR)
> 
> include $(TOPDIR)/config/Makedefs
> 
>@@ -35,19 +36,15 @@
> all:: $(PROG)
> 
> $(PROG): $(OBJS)
>-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBFONTCONFIG)
>+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(OBJS) \
>+	$(LIBFONTCONFIG)
> 
> $(OBJS): $(HEADERS)
> 
>-install:: $(DESTDIR)$(BINDIR)
>-
>-$(DESTDIR)$(BINDIR):
>-	mkdir -p $@
>-
>-install:: $(DESTDIR)$(BINDIR)/$(PROG)
>-
>-$(DESTDIR)$(BINDIR)/$(PROG): $(PROG)
>-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)/$<
>+install: $(PROG)
>+	$(mkinstalldirs) $(DESTDIR)$(BINDIR)
>+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) \
>+	$(DESTDIR)$(BINDIR)/$<
> 
> clean::
> 	rm -f $(PROG) $(OBJS)
>--- fontconfig/fc-list/Makefile.in.orig	Tue Jan 28 17:10:53 2003
>+++ fontconfig/fc-list/Makefile.in	Tue Jan 28 17:28:17 2003
>@@ -23,6 +23,7 @@
> #
> 
> TOPDIR=..
>+top_builddir=$(TOPDIR)
> 
> include $(TOPDIR)/config/Makedefs
> 
>@@ -35,19 +36,15 @@
> all:: $(PROG)
> 
> $(PROG): $(OBJS)
>-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBFONTCONFIG)
>+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(OBJS) \
>+	$(LIBFONTCONFIG)
> 
> $(OBJS): $(HEADERS)
> 
>-install:: $(DESTDIR)$(BINDIR)
>-
>-$(DESTDIR)$(BINDIR):
>-	mkdir -p $@
>-
>-install:: $(DESTDIR)$(BINDIR)/$(PROG)
>-
>-$(DESTDIR)$(BINDIR)/$(PROG): $(PROG)
>-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)/$<
>+install: $(PROG)
>+	$(mkinstalldirs) $(DESTDIR)$(BINDIR)
>+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) \
>+	$(DESTDIR)$(BINDIR)/$<
> 
> clean::
> 	rm -f $(PROG) $(OBJS)

Actions: View | Splinter Review

Attachments on bug 28: 20

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.