Mercurial > gub
changeset 3550:0e1e98a5b4a5
Build freetype for cygwin as freetype2.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Wed, 30 May 2007 14:43:28 +0200 |
| parents | 22c153d2f44b |
| children | 053b297739c2 |
| files | gub/cygwin.py gub/specs/freetype.py gub/specs/freetype2.py lilypond.make patches/freetype-libtool-no-version.patch |
| diffstat | 5 files changed, 36 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/cygwin.py Wed May 30 14:03:34 2007 +0200 +++ b/gub/cygwin.py Wed May 30 14:43:28 2007 +0200 @@ -298,9 +298,11 @@ 'expat-devel': ['expat'], 'fontconfig-runtime' : ['libfontconfig1'], 'fontconfig-devel' : ['libfontconfig-devel'], -# 'freetype' : ['freetype2'], + 'freetype' : ['freetype2'], + 'freetype-devel' : ['libfreetype2-devel'], 'freetype-runtime' : ['libfreetype26'], - 'freetype-devel' : ['libfreetype2-devel'], + 'freetype2-devel' : ['libfreetype2-devel'], + 'freetype2-runtime' : ['libfreetype26'], 'gettext' : ['libintl8', 'libintl3'], 'gmp-devel': ['gmp'], 'guile-runtime' : ['libguile17', 'libguile12'],
--- a/gub/specs/freetype.py Wed May 30 14:03:34 2007 +0200 +++ b/gub/specs/freetype.py Wed May 30 14:43:28 2007 +0200 @@ -71,6 +71,10 @@ Freetype.__init__ (self, settings) self.with_template (version='2.1.10', mirror=mirrors.nongnu_savannah) + def patch (self): + Freetype.patch (self) + self.system ('cd %(srcdir)s && patch -p1 < %(patchdir)s/freetype-libtool-no-version.patch') + def get_subpackage_definitions (self): d = dict (Freetype.get_subpackage_definitions (self)) # urg, must remove usr/share. Because there is no doc package,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gub/specs/freetype2.py Wed May 30 14:43:28 2007 +0200 @@ -0,0 +1,9 @@ +from gub import mirrors +from gub.specs import freetype + +class Freetype2__cygwin (freetype.Freetype__cygwin): + def __init__ (self, settings): + freetype.Freetype__cygwin.__init__ (self, settings) + self.with_template (version='2.1.10', + mirror=mirrors.nongnu_savannah, + name='freetype')
--- a/lilypond.make Wed May 30 14:03:34 2007 +0200 +++ b/lilypond.make Wed May 30 14:43:28 2007 +0200 @@ -11,7 +11,7 @@ .PHONY: unlocked-doc-export doc-export unlocked-dist-check dist-check .PHONY: cygwin-libtool cygwin-libtool-installer cygwin-fontconfig -.PHONY: cygwin-freetype cygwin-freetype-installer +.PHONY: cygwin-freetype2 cygwin-freetype2-installer .PHONY: cygwin-fontconfig-installer cygwin-guile cygwin-guile-installer .PHONY: cygwin-lilypond cygwin-lilypond-installer upload-setup-ini darwin-ppc @@ -78,7 +78,7 @@ unlocked-update-versions: python gub/versiondb.py --dbfile $(LILYPOND_VERSIONS) --download --platforms="$(PLATFORMS)" - python gub/versiondb.py --dbfile uploads/freetype.versions --download --platforms="$(PLATFORMS)" + python gub/versiondb.py --dbfile uploads/freetype2.versions --download --platforms="$(PLATFORMS)" python gub/versiondb.py --dbfile uploads/fontconfig.versions --download --platforms="$(PLATFORMS)" python gub/versiondb.py --dbfile uploads/guile.versions --download --platforms="$(PLATFORMS)" python gub/versiondb.py --dbfile uploads/libtool.versions --download --platforms="$(PLATFORMS)" @@ -129,17 +129,17 @@ cygwin-libtool-installer: $(CYGWIN_PACKAGER) libtool -cygwin-freetype: +cygwin-freetype2: # when forcing a source build we remove everything, # because freetype by default comes from cygwin as a binary rm -f uploads/cygwin/setup.ini rm -rf target/cygwin/ $(call INVOKE_GUP, cygwin) install cross/gcc # $(call INVOKE_GUB,cygwin) freetype-config - $(call INVOKE_GUB,cygwin) --build-source freetype + $(call INVOKE_GUB,cygwin) --build-source freetype2 -cygwin-freetype-installer: - $(CYGWIN_PACKAGER) freetype +cygwin-freetype2-installer: + $(CYGWIN_PACKAGER) freetype2 cygwin-fontconfig: # when forcing a source build we remove everything,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/freetype-libtool-no-version.patch Wed May 30 14:43:28 2007 +0200 @@ -0,0 +1,13 @@ +This fixes building of the dll on Cygwin. + +--- ./builds/unix/unix-cc.in~ 2003-11-09 09:37:13.000000000 +0100 ++++ ./builds/unix/unix-cc.in 2007-05-30 14:34:33.000000000 +0200 +@@ -93,7 +93,7 @@ + # Library linking + # + LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ +- -rpath $(libdir) -version-info $(version_info) \ ++ -rpath $(libdir) -no-undefined -version-info $(version_info) \ + $(LDFLAGS) + +