* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2007-01-10 23:54 andersen at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: andersen at uclibc.org @ 2007-01-10 23:54 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2007-01-10 15:54:35 -0800 (Wed, 10 Jan 2007)
New Revision: 17235
Log:
fixup freetype build and install locations
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2007-01-10 22:35:54 UTC (rev 17234)
+++ trunk/buildroot/package/freetype/freetype.mk 2007-01-10 23:54:35 UTC (rev 17235)
@@ -26,22 +26,22 @@
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=$(STAGING_DIR)/usr );
+ --prefix=$(STAGING_DIR) );
touch $(FREETYPE_DIR)/.configured
$(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured
$(MAKE) -C $(FREETYPE_DIR)
touch $(FREETYPE_DIR)/.compiled
-$(STAGING_DIR)/usr/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
+$(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
$(MAKE) -C $(FREETYPE_DIR) install
touch -c $(STAGING_DIR)/lib/libfreetype.so
-$(TARGET_DIR)/usr/lib/libfreetype.so: $(STAGING_DIR)/usr/lib/libfreetype.so
- cp -dpf $(STAGING_DIR)/usr/lib/libfreetype.so* $(TARGET_DIR)/usr/lib/
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libfreetype.so
+$(TARGET_DIR)/lib/libfreetype.so: $(STAGING_DIR)/lib/libfreetype.so
+ cp -dpf $(STAGING_DIR)/lib/libfreetype.so* $(TARGET_DIR)/lib/
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libfreetype.so
-freetype: uclibc $(TARGET_DIR)/usr/lib/libfreetype.so
+freetype: uclibc $(TARGET_DIR)/lib/libfreetype.so
freetype-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2007-01-16 19:51 aldot at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: aldot at uclibc.org @ 2007-01-16 19:51 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-01-16 11:51:03 -0800 (Tue, 16 Jan 2007)
New Revision: 17329
Log:
- prepare a host-freetype target that could be used to build the build-utils
for fontconfig (note that CCexe isn't cached in configure, so just passing it to make later on is enough).
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2007-01-16 19:48:46 UTC (rev 17328)
+++ trunk/buildroot/package/freetype/freetype.mk 2007-01-16 19:51:03 UTC (rev 17329)
@@ -8,6 +8,8 @@
FREETYPE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
FREETYPE_CAT:=$(BZCAT)
FREETYPE_DIR:=$(BUILD_DIR)/freetype-$(FREETYPE_VERSION)
+FREETYPE_DIR1:=$(TOOL_BUILD_DIR)/freetype-$(FREETYPE_VERSION)
+FREETYPE_HOST_DIR:=$(TOOL_BUILD_DIR)/freetype-$(FREETYPE_VERSION)-host
$(DL_DIR)/$(FREETYPE_SOURCE):
$(WGET) -P $(DL_DIR) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
@@ -18,11 +20,11 @@
$(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(FREETYPE_DIR)/.unpacked
+# freetype for the target
$(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
(cd $(FREETYPE_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) " \
- CCexe="$(HOSTCC)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -60,6 +62,31 @@
cp -dpf $(STAGING_DIR)/lib/libfreetype.so* $(TARGET_DIR)/lib/
-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libfreetype.so
+# freetype for the host, needed for build-tools of fontconfig
+
+# great, it can't be built out of tree reliably
+$(FREETYPE_DIR1)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
+ $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ touch $(FREETYPE_DIR1)/.unpacked
+
+$(FREETYPE_DIR1)/.configured: $(FREETYPE_DIR1)/.unpacked
+ (cd $(FREETYPE_DIR1); \
+ ./configure \
+ CC="$(HOSTCC)" \
+ --prefix="$(FREETYPE_HOST_DIR)" \
+ );
+ touch $(FREETYPE_DIR1)/.configured
+
+$(FREETYPE_DIR1)/.compiled: $(FREETYPE_DIR1)/.configured
+ $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR1)
+ touch $(FREETYPE_DIR1)/.compiled
+
+$(FREETYPE_HOST_DIR)/lib/libfreetype.so: $(FREETYPE_DIR1)/.configured
+ $(MAKE) -C $(FREETYPE_DIR1) install
+ touch -c $@
+
+host-freetype: $(FREETYPE_HOST_DIR)/lib/libfreetype.so
+
freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so
freetype-clean:
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2007-08-14 6:28 ulf at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: ulf at uclibc.org @ 2007-08-14 6:28 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-13 23:28:01 -0700 (Mon, 13 Aug 2007)
New Revision: 19499
Log:
Add links to 'usr/include/freetype2/freetype' to 'include' and 'usr/include'. Add PHONY targets
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2007-08-14 06:18:02 UTC (rev 19498)
+++ trunk/buildroot/package/freetype/freetype.mk 2007-08-14 06:28:01 UTC (rev 19499)
@@ -14,8 +14,6 @@
$(DL_DIR)/$(FREETYPE_SOURCE):
$(WGET) -P $(DL_DIR) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
-freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE)
-
$(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
$(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(FREETYPE_DIR)/.unpacked
@@ -48,6 +46,12 @@
$(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR)
touch $(FREETYPE_DIR)/.compiled
+$(STAGING_DIR)/usr/include/freetype:
+ ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype
+
+$(STAGING_DIR)/include/freetype:
+ ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype
+
$(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libfreetype.la
@@ -85,10 +89,14 @@
$(MAKE) -C $(FREETYPE_DIR1) install
touch -c $@
-host-freetype: $(FREETYPE_HOST_DIR)/lib/libfreetype.so
+.PHONY: freetype freetype-source freetype-links freetype-clean freetype-dirclean
-freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so
+freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so freetype-links
+freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE)
+
+freetype-links: $(STAGING_DIR)/usr/include/freetype $(STAGING_DIR)/include/freetype
+
freetype-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall
-$(MAKE) -C $(FREETYPE_DIR) clean
@@ -96,6 +104,10 @@
freetype-dirclean:
rm -rf $(FREETYPE_DIR)
+.PHONY: host-freetype
+
+host-freetype: $(FREETYPE_HOST_DIR)/lib/libfreetype.so
+
#############################################################
#
# Toplevel Makefile options
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2007-09-23 9:55 ulf at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: ulf at uclibc.org @ 2007-09-23 9:55 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-23 02:55:17 -0700 (Sun, 23 Sep 2007)
New Revision: 19958
Log:
Do not use $(STAGING_DIR)/include for freetype, for now
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2007-09-23 09:53:43 UTC (rev 19957)
+++ trunk/buildroot/package/freetype/freetype.mk 2007-09-23 09:55:17 UTC (rev 19958)
@@ -50,8 +50,9 @@
$(STAGING_DIR)/usr/include/freetype:
ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype
-$(STAGING_DIR)/include/freetype:
- ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype
+#$(STAGING_DIR)/include/freetype:
+# mkdir -p $(STAGING_DIR)/include
+# ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype
$(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install
@@ -96,7 +97,7 @@
freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE)
-freetype-links: $(STAGING_DIR)/usr/include/freetype $(STAGING_DIR)/include/freetype
+freetype-links: $(STAGING_DIR)/usr/include/freetype # $(STAGING_DIR)/include/freetype
freetype-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2007-11-16 10:16 vanokuten at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: vanokuten at uclibc.org @ 2007-11-16 10:16 UTC (permalink / raw)
To: buildroot
Author: vanokuten
Date: 2007-11-16 02:16:48 -0800 (Fri, 16 Nov 2007)
New Revision: 20431
Log:
add more recent version of freetype, required at least for avr32 to build correctly
Modified:
trunk/buildroot/package/freetype/Config.in
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/Config.in
===================================================================
--- trunk/buildroot/package/freetype/Config.in 2007-11-16 05:24:43 UTC (rev 20430)
+++ trunk/buildroot/package/freetype/Config.in 2007-11-16 10:16:48 UTC (rev 20431)
@@ -4,3 +4,23 @@
help
http://www.freetype.org/
+
+choice
+ prompt "Freetype Version"
+ depends BR2_PACKAGE_FREETYPE
+ default BR2_FREETYPE_VERSION_2_2_1
+ help
+ Select the version of Freetype you wish to use.
+
+ config BR2_FREETYPE_VERSION_2_2_1
+ bool "Freetype 2.2.1"
+
+ config BR2_FREETYPE_VERSION_2_3_5
+ bool "Freetype 2.3.5"
+
+endchoice
+
+config BR2_FREETYPE_VERSION
+ string
+ default "2.2.1" if BR2_FREETYPE_VERSION_2_2_1
+ default "2.3.5" if BR2_FREETYPE_VERSION_2_3_5
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2007-11-16 05:24:43 UTC (rev 20430)
+++ trunk/buildroot/package/freetype/freetype.mk 2007-11-16 10:16:48 UTC (rev 20431)
@@ -3,7 +3,7 @@
# freetype
#
#############################################################
-FREETYPE_VERSION:=2.2.1
+FREETYPE_VERSION:=$(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
FREETYPE_SOURCE:=freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
FREETYPE_CAT:=$(BZCAT)
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-03-06 18:10 ninevoltz at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:10 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:09:59 -0800 (Thu, 06 Mar 2008)
New Revision: 21193
Log:
updated freetype
Added:
trunk/buildroot/package/freetype/freetype-2.2.1-libdir-la.patch
Removed:
trunk/buildroot/package/freetype/libdir-la.patch
Modified:
trunk/buildroot/package/freetype/Config.in
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/Config.in
===================================================================
--- trunk/buildroot/package/freetype/Config.in 2008-03-06 18:09:37 UTC (rev 21192)
+++ trunk/buildroot/package/freetype/Config.in 2008-03-06 18:09:59 UTC (rev 21193)
@@ -2,6 +2,7 @@
bool "freetype"
default n
help
+ a free, high-quality and portable font engine.
http://www.freetype.org/
Added: trunk/buildroot/package/freetype/freetype-2.2.1-libdir-la.patch
===================================================================
--- trunk/buildroot/package/freetype/freetype-2.2.1-libdir-la.patch (rev 0)
+++ trunk/buildroot/package/freetype/freetype-2.2.1-libdir-la.patch 2008-03-06 18:09:59 UTC (rev 21193)
@@ -0,0 +1,77 @@
+--- freetype-2.2.1/builds/unix/ltmain.sh.orig 2006-04-20 08:27:27.000000000 -0600
++++ freetype-2.2.1/builds/unix/ltmain.sh 2007-01-13 14:26:01.000000000 -0700
+@@ -273,8 +273,9 @@
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit $EXIT_FAILURE
++ $echo "$modename: defaulting to \`CC'"
++ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
++# exit $EXIT_FAILURE
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
+@@ -2404,8 +2405,14 @@
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -2886,6 +2893,16 @@
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+ path="$absdir/$objdir"
++# This interferes with crosscompilation. -CL
++# else
++# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++# if test -z "$libdir"; then
++# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++# exit 1
++# fi
++# if test "$absdir" != "$libdir"; then
++# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++# fi
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+@@ -5598,6 +5615,10 @@
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+@@ -5919,10 +5940,13 @@
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- if test "$inst_prefix_dir" = "$destdir"; then
+- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit $EXIT_FAILURE
+- fi
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # if test "$inst_prefix_dir" = "$destdir"; then
++ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++ # exit $EXIT_FAILURE
++ # fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-03-06 18:09:37 UTC (rev 21192)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-03-06 18:09:59 UTC (rev 21193)
@@ -3,119 +3,24 @@
# freetype
#
#############################################################
-FREETYPE_VERSION:=$(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
-FREETYPE_SOURCE:=freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
-FREETYPE_CAT:=$(BZCAT)
-FREETYPE_DIR:=$(BUILD_DIR)/freetype-$(FREETYPE_VERSION)
-FREETYPE_DIR1:=$(TOOL_BUILD_DIR)/freetype-$(FREETYPE_VERSION)
-FREETYPE_HOST_DIR:=$(TOOL_BUILD_DIR)/freetype-$(FREETYPE_VERSION)-host
+FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
+FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
+FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
+FREETYPE_AUTORECONF = NO
+FREETYPE_INSTALL_STAGING = YES
+FREETYPE_INSTALL_TARGET = YES
+FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-$(DL_DIR)/$(FREETYPE_SOURCE):
- $(WGET) -P $(DL_DIR) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
+FREETYPE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) --prefix=/usr \
+ --exec-prefix=/usr --bindir=/usr/bin \
+ --sbindir=/usr/sbin --libdir=/usr/lib \
+ --libexecdir=/usr/lib --sysconfdir=/etc \
+ --datadir=/usr/share --localstatedir=/var \
+ --includedir=/usr/include --mandir=/usr/man \
+ --infodir=/usr/info
-$(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
- $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(FREETYPE_DIR)
- $(CONFIG_UPDATE) $(FREETYPE_DIR)/builds/unix
- touch $(FREETYPE_DIR)/.unpacked
+FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
+FREETYPE_DEPENDENCIES = uclibc pkgconfig
-# freetype for the target
-$(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
- (cd $(FREETYPE_DIR); rm -f config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
- )
- touch $(FREETYPE_DIR)/.configured
-
-$(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured
- $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR)
- touch $(FREETYPE_DIR)/.compiled
-
-$(STAGING_DIR)/usr/include/freetype:
- ln -sf ./freetype2/freetype $(STAGING_DIR)/usr/include/freetype
-
-#$(STAGING_DIR)/include/freetype:
-# mkdir -p $(STAGING_DIR)/include
-# ln -sf ../usr/include/freetype2/freetype $(STAGING_DIR)/include/freetype
-
-$(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libfreetype.la
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
- -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
- -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
- -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
- $(STAGING_DIR)/usr/bin/freetype-config
- touch -c $(STAGING_DIR)/lib/libfreetype.so
-
-$(TARGET_DIR)/lib/libfreetype.so: $(STAGING_DIR)/lib/libfreetype.so
- cp -dpf $(STAGING_DIR)/lib/libfreetype.so* $(TARGET_DIR)/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libfreetype.so
-
-# freetype for the host, needed for build-tools of fontconfig
-
-# great, it can't be built out of tree reliably
-$(FREETYPE_DIR1)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
- $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
- touch $(FREETYPE_DIR1)/.unpacked
-
-$(FREETYPE_DIR1)/.configured: $(FREETYPE_DIR1)/.unpacked
- (cd $(FREETYPE_DIR1); \
- ./configure \
- CC="$(HOSTCC)" \
- --prefix="$(FREETYPE_HOST_DIR)" \
- )
- touch $(FREETYPE_DIR1)/.configured
-
-$(FREETYPE_DIR1)/.compiled: $(FREETYPE_DIR1)/.configured
- $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR1)
- touch $(FREETYPE_DIR1)/.compiled
-
-$(FREETYPE_HOST_DIR)/lib/libfreetype.so: $(FREETYPE_DIR1)/.configured
- $(MAKE) -C $(FREETYPE_DIR1) install
- touch -c $@
-
-.PHONY: freetype freetype-source freetype-links freetype-clean freetype-dirclean
-
-freetype: uclibc pkgconfig $(TARGET_DIR)/lib/libfreetype.so freetype-links
-
-freetype-source: $(DL_DIR)/$(FREETYPE_SOURCE)
-
-freetype-links: $(STAGING_DIR)/usr/include/freetype # $(STAGING_DIR)/include/freetype
-
-freetype-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FREETYPE_DIR) uninstall
- -$(MAKE) -C $(FREETYPE_DIR) clean
-
-freetype-dirclean:
- rm -rf $(FREETYPE_DIR)
-
-.PHONY: host-freetype
-
-host-freetype: $(FREETYPE_HOST_DIR)/lib/libfreetype.so
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_FREETYPE)),y)
-TARGETS+=freetype
-endif
+$(eval $(call AUTOTARGETS,package,freetype))
\ No newline at end of file
Deleted: trunk/buildroot/package/freetype/libdir-la.patch
===================================================================
--- trunk/buildroot/package/freetype/libdir-la.patch 2008-03-06 18:09:37 UTC (rev 21192)
+++ trunk/buildroot/package/freetype/libdir-la.patch 2008-03-06 18:09:59 UTC (rev 21193)
@@ -1,77 +0,0 @@
---- freetype-2.2.1/builds/unix/ltmain.sh.orig 2006-04-20 08:27:27.000000000 -0600
-+++ freetype-2.2.1/builds/unix/ltmain.sh 2007-01-13 14:26:01.000000000 -0700
-@@ -273,8 +273,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2404,8 +2405,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -2886,6 +2893,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5598,6 +5615,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5919,10 +5940,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-04-25 16:45 ninevoltz at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-25 16:45 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-25 09:45:49 -0700 (Fri, 25 Apr 2008)
New Revision: 21861
Log:
Change freetype makefile to fix $(STAGING_DIR)/usr/bin/freetype-config
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-04-25 16:45:27 UTC (rev 21860)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-04-25 16:45:49 UTC (rev 21861)
@@ -4,23 +4,61 @@
#
#############################################################
FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
-FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
+FREETYPE_NAME = freetype-$(FREETYPE_VERSION)
+FREETYPE_DIR = $(BUILD_DIR)/$(FREETYPE_NAME)
FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
-FREETYPE_AUTORECONF = NO
-FREETYPE_INSTALL_STAGING = YES
-FREETYPE_INSTALL_TARGET = YES
-FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+FREETYPE_SOURCE:=$(FREETYPE_NAME).tar.bz2
+FREETYPE_DESTDIR:=$(STAGING_DIR)/usr/lib
+FREETYPE_CAT:=$(BZCAT)
-FREETYPE_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
+$(DL_DIR)/$(FREETYPE_SOURCE):
+ $(WGET) -P $(DL_DIR) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
+
+$(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
+ $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(FREETYPE_DIR) package/freetype/ \*.patch
+ $(CONFIG_UPDATE) $(FREETYPE_DIR)
+ touch $@
+
+$(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
+ (cd $(FREETYPE_DIR) && \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --prefix=/usr \
--exec-prefix=/usr --bindir=/usr/bin \
--sbindir=/usr/sbin --libdir=/usr/lib \
--libexecdir=/usr/lib --sysconfdir=/etc \
--datadir=/usr/share --localstatedir=/var \
--includedir=/usr/include --mandir=/usr/man \
- --infodir=/usr/info
+ --infodir=/usr/info \ )
+ touch $@
-FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig
+$(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured
+ $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR)
+ touch $@
-$(eval $(call AUTOTARGETS,package,freetype))
\ No newline at end of file
+$(FREETYPE_DIR)/.installed: $(FREETYPE_DIR)/.compiled
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(FREETYPE_DIR) install
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libfreetype.la
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/freetype-config
+ $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/freetype-config
+ $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/freetype-config
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/freetype-config
+ touch $@
+
+freetype: uclibc pkgconfig $(FREETYPE_DIR)/.installed
+
+freetype-clean:
+ -$(MAKE) -C $(FREETYPE_DIR) clean
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_FREETYPE)),y)
+TARGETS+=freetype
+endif
\ No newline at end of file
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-05-22 21:30 ulf at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: ulf at uclibc.org @ 2008-05-22 21:30 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-05-22 14:30:44 -0700 (Thu, 22 May 2008)
New Revision: 22053
Log:
Add end-of-line at last line of freetype.mk
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-05-22 17:49:58 UTC (rev 22052)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-05-22 21:30:44 UTC (rev 22053)
@@ -61,4 +61,4 @@
#############################################################
ifeq ($(strip $(BR2_PACKAGE_FREETYPE)),y)
TARGETS+=freetype
-endif
\ No newline at end of file
+endif
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-07-04 2:57 correa at uclibc.org
2008-07-05 19:08 ` Peter Korsgaard
0 siblings, 1 reply; 27+ messages in thread
From: correa at uclibc.org @ 2008-07-04 2:57 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2008-07-03 19:57:13 -0700 (Thu, 03 Jul 2008)
New Revision: 22622
Log:
Fix freetype-2.2.1 build in AVR32, possibly other platforms too
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-07-04 02:23:19 UTC (rev 22621)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-07-04 02:57:13 UTC (rev 22622)
@@ -18,10 +18,11 @@
$(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(FREETYPE_DIR) package/freetype/ \*.patch
$(CONFIG_UPDATE) $(FREETYPE_DIR)
+ $(CONFIG_UPDATE) $(FREETYPE_DIR)/builds/unix
touch $@
$(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
- (cd $(FREETYPE_DIR) && \
+ (cd $(FREETYPE_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
./configure \
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
2008-07-04 2:57 correa at uclibc.org
@ 2008-07-05 19:08 ` Peter Korsgaard
0 siblings, 0 replies; 27+ messages in thread
From: Peter Korsgaard @ 2008-07-05 19:08 UTC (permalink / raw)
To: buildroot
>>>>> "correa" == correa <correa@uclibc.org> writes:
correa> Author: correa
correa> Date: 2008-07-03 19:57:13 -0700 (Thu, 03 Jul 2008)
correa> New Revision: 22622
correa> Log:
correa> Fix freetype-2.2.1 build in AVR32, possibly other platforms too
correa> Modified:
correa> trunk/buildroot/package/freetype/freetype.mk
correa> $(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
correa> - (cd $(FREETYPE_DIR) && \
correa> + (cd $(FREETYPE_DIR); rm -rf config.cache; \
Why rm -r ?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-07-17 13:20 jacmet at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: jacmet at uclibc.org @ 2008-07-17 13:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-17 06:20:37 -0700 (Thu, 17 Jul 2008)
New Revision: 22863
Log:
freetype: fix target install and clean / dirclean
- target install didn't strip library
- clean didn't uninstall from staging / target
- dirclean target missing
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-07-17 13:20:23 UTC (rev 22862)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-07-17 13:20:37 UTC (rev 22863)
@@ -48,13 +48,19 @@
$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/freetype-config
$(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/freetype-config
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/freetype-config
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfreetype.so
touch $@
freetype: uclibc pkgconfig $(FREETYPE_DIR)/.installed
freetype-clean:
+ -$(MAKE) -C $(FREETYPE_DIR) DESTDIR=$(STAGING_DIR) uninstall
+ -$(MAKE) -C $(FREETYPE_DIR) DESTDIR=$(TARGET_DIR) uninstall
-$(MAKE) -C $(FREETYPE_DIR) clean
+freetype-dirclean:
+ rm -rf $(FREETYPE_DIR)
+
#############################################################
#
# Toplevel Makefile options
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-09-05 1:03 hamish at uclibc.org
2008-09-05 9:52 ` Peter Korsgaard
0 siblings, 1 reply; 27+ messages in thread
From: hamish at uclibc.org @ 2008-09-05 1:03 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-09-04 18:03:45 -0700 (Thu, 04 Sep 2008)
New Revision: 23325
Log:
Version bump to 2.3.7
This package should be converted to use Makefile.autotools.in by someone who uses it..
Modified:
trunk/buildroot/package/freetype/Config.in
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/Config.in
===================================================================
--- trunk/buildroot/package/freetype/Config.in 2008-09-04 16:16:47 UTC (rev 23324)
+++ trunk/buildroot/package/freetype/Config.in 2008-09-05 01:03:45 UTC (rev 23325)
@@ -16,12 +16,12 @@
config BR2_FREETYPE_VERSION_2_2_1
bool "Freetype 2.2.1"
- config BR2_FREETYPE_VERSION_2_3_5
- bool "Freetype 2.3.5"
+ config BR2_FREETYPE_VERSION_2_3_7
+ bool "Freetype 2.3.7"
endchoice
config BR2_FREETYPE_VERSION
string
default "2.2.1" if BR2_FREETYPE_VERSION_2_2_1
- default "2.3.5" if BR2_FREETYPE_VERSION_2_3_5
+ default "2.3.7" if BR2_FREETYPE_VERSION_2_3_7
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-09-04 16:16:47 UTC (rev 23324)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-09-05 01:03:45 UTC (rev 23325)
@@ -16,7 +16,7 @@
$(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
$(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FREETYPE_DIR) package/freetype/ \*.patch
+ toolchain/patch-kernel.sh $(FREETYPE_DIR) package/freetype/ freetype-$(FREETYPE_VERSION)-\*.patch
$(CONFIG_UPDATE) $(FREETYPE_DIR)
$(CONFIG_UPDATE) $(FREETYPE_DIR)/builds/unix
touch $@
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
2008-09-05 1:03 hamish at uclibc.org
@ 2008-09-05 9:52 ` Peter Korsgaard
2008-09-05 12:53 ` Hamish Moffatt
2008-09-05 17:44 ` danieljlaird at hotmail.com
0 siblings, 2 replies; 27+ messages in thread
From: Peter Korsgaard @ 2008-09-05 9:52 UTC (permalink / raw)
To: buildroot
>>>>> "hamish" == hamish <hamish@uclibc.org> writes:
Hi,
hamish> Author: hamish
hamish> Date: 2008-09-04 18:03:45 -0700 (Thu, 04 Sep 2008)
hamish> New Revision: 23325
hamish> Log:
hamish> Version bump to 2.3.7
hamish> This package should be converted to use Makefile.autotools.in
hamish> by someone who uses it..
Heh ;)
hamish> Changeset:
hamish> Modified: trunk/buildroot/package/freetype/Config.in
hamish> ===================================================================
hamish> --- trunk/buildroot/package/freetype/Config.in 2008-09-04 16:16:47 UTC (rev 23324)
hamish> +++ trunk/buildroot/package/freetype/Config.in 2008-09-05 01:03:45 UTC (rev 23325)
hamish> @@ -16,12 +16,12 @@
hamish> config BR2_FREETYPE_VERSION_2_2_1
hamish> bool "Freetype 2.2.1"
hamish> - config BR2_FREETYPE_VERSION_2_3_5
hamish> - bool "Freetype 2.3.5"
hamish> + config BR2_FREETYPE_VERSION_2_3_7
hamish> + bool "Freetype 2.3.7"
Please use 2_3_x like we do it for busybox and haserl so kconfig will
do the right thing when you update your buildroot snapshot.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
2008-09-05 9:52 ` Peter Korsgaard
@ 2008-09-05 12:53 ` Hamish Moffatt
2008-09-05 18:31 ` Peter Korsgaard
2008-09-05 17:44 ` danieljlaird at hotmail.com
1 sibling, 1 reply; 27+ messages in thread
From: Hamish Moffatt @ 2008-09-05 12:53 UTC (permalink / raw)
To: buildroot
On Fri, Sep 05, 2008 at 11:52:33AM +0200, Peter Korsgaard wrote:
> hamish> Changeset:
> hamish> Modified: trunk/buildroot/package/freetype/Config.in
> hamish> ===================================================================
> hamish> --- trunk/buildroot/package/freetype/Config.in 2008-09-04 16:16:47 UTC (rev 23324)
> hamish> +++ trunk/buildroot/package/freetype/Config.in 2008-09-05 01:03:45 UTC (rev 23325)
> hamish> @@ -16,12 +16,12 @@
> hamish> config BR2_FREETYPE_VERSION_2_2_1
> hamish> bool "Freetype 2.2.1"
>
> hamish> - config BR2_FREETYPE_VERSION_2_3_5
> hamish> - bool "Freetype 2.3.5"
> hamish> + config BR2_FREETYPE_VERSION_2_3_7
> hamish> + bool "Freetype 2.3.7"
>
> Please use 2_3_x like we do it for busybox and haserl so kconfig will
> do the right thing when you update your buildroot snapshot.
Hi Peter,
That sounds good but I'm not really sure what you mean?
choice
prompt "BusyBox Version"
depends on BR2_PACKAGE_BUSYBOX
default BR2_BUSYBOX_VERSION_1_12_X
help
Select the version of BusyBox you wish to use.
config BR2_BUSYBOX_VERSION_1_2_2_1
bool "BusyBox 1.2.2.1"
depends on BR2_DEPRECATED
[...]
endchoice
config BR2_BUSYBOX_VERSION
string
default "1.2.2.1" if BR2_BUSYBOX_VERSION_1_2_2_1
default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1
default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
default "1.10.4" if BR2_BUSYBOX_VERSION_1_10_X
default "1.11.2" if BR2_BUSYBOX_VERSION_1_11_X
default "1.12.0" if BR2_BUSYBOX_VERSION_1_12_X
How's it different?
Thanks and regards
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
2008-09-05 9:52 ` Peter Korsgaard
2008-09-05 12:53 ` Hamish Moffatt
@ 2008-09-05 17:44 ` danieljlaird at hotmail.com
1 sibling, 0 replies; 27+ messages in thread
From: danieljlaird at hotmail.com @ 2008-09-05 17:44 UTC (permalink / raw)
To: buildroot
I use freetype etc so I will look into 'auto tooling' it within the next
couple of weeks.
I am currently testing version bumps of GLIB, GTK, CAIRO, PIXMAN etc. Once
done will feedback.
As well as trying to do the dir move stuff.
As indicated I hope to move all the block device stuff and xml tools stuff
next.
Cheers
Dan
--------------------------------------------------
From: "Peter Korsgaard" <jacmet@uclibc.org>
Sent: Friday, September 05, 2008 10:52 AM
To: <buildroot@uclibc.org>
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/freetype
>>>>>> "hamish" == hamish <hamish@uclibc.org> writes:
>
> Hi,
>
> hamish> Author: hamish
> hamish> Date: 2008-09-04 18:03:45 -0700 (Thu, 04 Sep 2008)
> hamish> New Revision: 23325
>
> hamish> Log:
> hamish> Version bump to 2.3.7
> hamish> This package should be converted to use Makefile.autotools.in
> hamish> by someone who uses it..
>
> Heh ;)
>
> hamish> Changeset:
> hamish> Modified: trunk/buildroot/package/freetype/Config.in
> hamish>
> ===================================================================
> hamish> --- trunk/buildroot/package/freetype/Config.in 2008-09-04 16:16:47
> UTC (rev 23324)
> hamish> +++ trunk/buildroot/package/freetype/Config.in 2008-09-05 01:03:45
> UTC (rev 23325)
> hamish> @@ -16,12 +16,12 @@
> hamish> config BR2_FREETYPE_VERSION_2_2_1
> hamish> bool "Freetype 2.2.1"
>
> hamish> - config BR2_FREETYPE_VERSION_2_3_5
> hamish> - bool "Freetype 2.3.5"
> hamish> + config BR2_FREETYPE_VERSION_2_3_7
> hamish> + bool "Freetype 2.3.7"
>
> Please use 2_3_x like we do it for busybox and haserl so kconfig will
> do the right thing when you update your buildroot snapshot.
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
2008-09-05 12:53 ` Hamish Moffatt
@ 2008-09-05 18:31 ` Peter Korsgaard
2008-09-06 4:22 ` Hamish Moffatt
0 siblings, 1 reply; 27+ messages in thread
From: Peter Korsgaard @ 2008-09-05 18:31 UTC (permalink / raw)
To: buildroot
>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
Hi,
Hamish> default "1.12.0" if BR2_BUSYBOX_VERSION_1_12_X
Hamish> How's it different?
It's different in the sense that the Kconfig symbol is called
BR2_BUSYBOX_VERSION_1_12_X, so the configuration doesn't change if you
bump the minor version (Yes, I know it isn't done for the legacy
versions, simply because that would break existing configs).
The freetype equivalent would be BR2_FREETYPE_VERSION_2_3_x.
Hope this makes it more clear.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
2008-09-05 18:31 ` Peter Korsgaard
@ 2008-09-06 4:22 ` Hamish Moffatt
0 siblings, 0 replies; 27+ messages in thread
From: Hamish Moffatt @ 2008-09-06 4:22 UTC (permalink / raw)
To: buildroot
On Fri, Sep 05, 2008 at 08:31:16PM +0200, Peter Korsgaard wrote:
> >>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:
>
> Hi,
>
> Hamish> default "1.12.0" if BR2_BUSYBOX_VERSION_1_12_X
>
> Hamish> How's it different?
>
> It's different in the sense that the Kconfig symbol is called
> BR2_BUSYBOX_VERSION_1_12_X, so the configuration doesn't change if you
> bump the minor version (Yes, I know it isn't done for the legacy
> versions, simply because that would break existing configs).
>
> The freetype equivalent would be BR2_FREETYPE_VERSION_2_3_x.
>
> Hope this makes it more clear.
Oh yes I see. Good suggestion, thanks.
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-10-09 12:50 laird at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: laird at uclibc.org @ 2008-10-09 12:50 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-10-09 05:50:56 -0700 (Thu, 09 Oct 2008)
New Revision: 23637
Log:
package/freetype: Convert to Makefile.autotools.in
Use AutoTools.in to build freetype.
Slight issue with freetype installation to TARGET_DIR.
Doing an install results in far too many files being copied in.
So for now I do what the old makefile did which is copy the .so files
and links manually rather than using a make install.
It also uses the autotools.in additions to not use the generic libtool patch and
use a local one instead.
Daniel Laird
Added:
trunk/buildroot/package/freetype/freetype-2.3.7-libdir-la.patch
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Added: trunk/buildroot/package/freetype/freetype-2.3.7-libdir-la.patch
===================================================================
--- trunk/buildroot/package/freetype/freetype-2.3.7-libdir-la.patch (rev 0)
+++ trunk/buildroot/package/freetype/freetype-2.3.7-libdir-la.patch 2008-10-09 12:50:56 UTC (rev 23637)
@@ -0,0 +1,81 @@
+diff -urN freetype-2.3.7.orig/builds/unix/ltmain.sh freetype-2.3.7/builds/unix/ltmain.sh
+--- freetype-2.3.7.orig/builds/unix/ltmain.sh 2008-09-16 15:55:36.000000000 +0100
++++ freetype-2.3.7/builds/unix/ltmain.sh 2008-09-22 09:18:36.000000000 +0100
+@@ -1047,8 +1047,9 @@
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+- func_echo "unable to infer tagged configuration"
+- func_fatal_error "specify a tag with \`--tag'"
++ func_echo "unable to infer tagged configuration"
++ func_echo "$modename: defaulting to \`CC'"
++ func_echo "$modename: if this is not correct, specify a tag with \`--tag'"
+ # else
+ # func_verbose "using $tagname tagged configuration"
+ fi
+@@ -2017,8 +2018,11 @@
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++ #
++ # This breaks install into our staging area. -PB
++ #
++ #test "$inst_prefix_dir" = "$destdir" && \
++ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -4885,8 +4889,14 @@
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -5408,13 +5418,16 @@
+ ;;
+ esac
+ else
+- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+- test -z "$libdir" && \
+- func_fatal_error "\`$deplib' is not a valid libtool archive"
+- test "$absdir" != "$libdir" && \
+- func_warning "\`$deplib' seems to be moved"
+-
+- path="-L$absdir"
++# This interferes with crosscompilation. -CL
++# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++# test -z "$libdir" && \
++# func_fatal_error "\`$deplib' is not a valid libtool archive"
++# test "$absdir" != "$libdir" && \
++# func_warning "\`$deplib' seems to be moved"
++#
++# path="-L$absdir"
++ path="-L$absdir/$objdir"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ fi
+ ;;
+ esac
+@@ -7520,6 +7533,10 @@
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-10-09 12:24:37 UTC (rev 23636)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-10-09 12:50:56 UTC (rev 23637)
@@ -4,68 +4,21 @@
#
#############################################################
FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
-FREETYPE_NAME = freetype-$(FREETYPE_VERSION)
-FREETYPE_DIR = $(BUILD_DIR)/$(FREETYPE_NAME)
FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
-FREETYPE_SOURCE:=$(FREETYPE_NAME).tar.bz2
-FREETYPE_DESTDIR:=$(STAGING_DIR)/usr/lib
-FREETYPE_CAT:=$(BZCAT)
+FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
+FREETYPE_LIBTOOL_PATCH = NO
+FREETYPE_INSTALL_STAGING = YES
+FREETYPE_INSTALL_TARGET = NO
+FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
+FREETYPE_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
+FREETYPE_DEPENDENCIES = uclibc pkgconfig
-$(DL_DIR)/$(FREETYPE_SOURCE):
- $(WGET) -P $(DL_DIR) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
+$(eval $(call AUTOTARGETS,package,freetype))
-$(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE)
- $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FREETYPE_DIR) package/freetype/ freetype-$(FREETYPE_VERSION)-\*.patch
- $(CONFIG_UPDATE) $(FREETYPE_DIR)
- $(CONFIG_UPDATE) $(FREETYPE_DIR)/builds/unix
- touch $@
-
-$(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
- (cd $(FREETYPE_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) --prefix=/usr \
- --exec-prefix=/usr --bindir=/usr/bin \
- --sbindir=/usr/sbin --libdir=/usr/lib \
- --libexecdir=/usr/lib --sysconfdir=/etc \
- --datadir=/usr/share --localstatedir=/var \
- --includedir=/usr/include --mandir=/usr/man \
- --infodir=/usr/info \ )
- touch $@
-
-$(FREETYPE_DIR)/.compiled: $(FREETYPE_DIR)/.configured
- $(MAKE) CCexe="$(HOSTCC)" -C $(FREETYPE_DIR)
- touch $@
-
-$(FREETYPE_DIR)/.installed: $(FREETYPE_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FREETYPE_DIR) install
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(FREETYPE_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libfreetype.la
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/freetype-config
- $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/freetype-config
- $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/freetype-config
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/freetype-config
+$(FREETYPE_HOOK_POST_BUILD):
+ -cp -a $(FREETYPE_DIR)/objs/.libs/libfreetype.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfreetype.so
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(FREETYPE_DIR)/builds/unix/freetype-config
+ $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(FREETYPE_DIR)/builds/unix/freetype-config
touch $@
-freetype: uclibc pkgconfig $(FREETYPE_DIR)/.installed
-
-freetype-clean:
- -$(MAKE) -C $(FREETYPE_DIR) DESTDIR=$(STAGING_DIR) uninstall
- -$(MAKE) -C $(FREETYPE_DIR) DESTDIR=$(TARGET_DIR) uninstall
- -$(MAKE) -C $(FREETYPE_DIR) clean
-
-freetype-dirclean:
- rm -rf $(FREETYPE_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_FREETYPE)),y)
-TARGETS+=freetype
-endif
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-11-10 21:43 hartleys
0 siblings, 0 replies; 27+ messages in thread
From: hartleys @ 2008-11-10 21:43 UTC (permalink / raw)
To: buildroot
On 2008-10-09 05:50:56, Daniel Laird wrote:
> Use AutoTools.in to build freetype.
> Slight issue with freetype installation to TARGET_DIR.
> Doing an install results in far too many files being copied in.
> So for now I do what the old makefile did which is copy the .so
> files and links manually rather than using a make install.
> It also uses the autotools.in additions to not use the generic
> libtool patch and use a local one instead.
For some reason the FREETYPE_HOOK_POST_BUILD step does not seem to be
running.
If I do 'make freetype-clean; make freetype-dirclean; make freetype' I
see the various MESSAGE macros for each step.
...
>>> freetype 2.2.1 Extracting
>>> freetype 2.2.1 Patching libtool
>>> freetype 2.2.1 Patching package/freetypes
...
>>> freetype 2.2.1 Configuring
...
>>> freetype 2.2.1 Building
...
>>> freetype 2.2.1 'Installing to host (staging directory)'
...
There is one error message in the last step that says:
...
rm -f
/home/bigguiness/buildroot/build_arm/staging_dir/usr/include/freetype2/f
reetype/internal/*
rmdir
/home/bigguiness/buildroot/build_arm/staging_dir/usr/include/freetype2/f
reetype/internal
rmdir:
/home/bigguiness/buildroot/build_arm/staging_dir/usr/include/freetype2/f
reetype/internal: No such file or directory
make[1]: [install] Error 1 (ignored)
Followed by some '/usr/bin/install ...' stuff. The last line of the make
is:
touch
/home/bigguiness/buildroot/build_arm/freetype-2.2.1/.stamp_staging_insta
lled
Am I missing something or doing something wrong to get the library
installed on my target?
Thanks,
Hartley
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-11-11 11:33 laird at uclibc.org
2009-01-24 8:28 ` Peter Korsgaard
0 siblings, 1 reply; 27+ messages in thread
From: laird at uclibc.org @ 2008-11-11 11:33 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-11-11 03:33:45 -0800 (Tue, 11 Nov 2008)
New Revision: 23998
Log:
package/freetype/freetype.mk: Add zib to dependencies
Looking into adding a configure cache to the build (like the GIT buildroot version)
This means that freetype needs to know about zlib so make
sure it had it as a dependency.
Also remove install rule for staging as it matches default.
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-11-11 11:05:57 UTC (rev 23997)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-11-11 11:33:45 UTC (rev 23998)
@@ -10,8 +10,7 @@
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = NO
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
-FREETYPE_DEPENDENCIES = uclibc pkgconfig
+FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib
$(eval $(call AUTOTARGETS,package,freetype))
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-12-08 4:43 hamish at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: hamish at uclibc.org @ 2008-12-08 4:43 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-12-07 20:43:33 -0800 (Sun, 07 Dec 2008)
New Revision: 24305
Log:
Override the target-install target properly rather than installing as a post-build hook
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2008-12-08 04:41:19 UTC (rev 24304)
+++ trunk/buildroot/package/freetype/freetype.mk 2008-12-08 04:43:33 UTC (rev 24305)
@@ -8,13 +8,13 @@
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_LIBTOOL_PATCH = NO
FREETYPE_INSTALL_STAGING = YES
-FREETYPE_INSTALL_TARGET = NO
+FREETYPE_INSTALL_TARGET = YES
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib
$(eval $(call AUTOTARGETS,package,freetype))
-$(FREETYPE_HOOK_POST_BUILD):
+$(FREETYPE_TARGET_INSTALL_TARGET):
-cp -a $(FREETYPE_DIR)/objs/.libs/libfreetype.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfreetype.so
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(FREETYPE_DIR)/builds/unix/freetype-config
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2008-12-08 13:42 jacmet at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: jacmet at uclibc.org @ 2008-12-08 13:42 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-08 05:42:01 -0800 (Mon, 08 Dec 2008)
New Revision: 24321
Log:
package/freetype: default to 2.3.7
Modified:
trunk/buildroot/package/freetype/Config.in
Changeset:
Modified: trunk/buildroot/package/freetype/Config.in
===================================================================
--- trunk/buildroot/package/freetype/Config.in 2008-12-08 13:41:59 UTC (rev 24320)
+++ trunk/buildroot/package/freetype/Config.in 2008-12-08 13:42:01 UTC (rev 24321)
@@ -9,7 +9,7 @@
choice
prompt "Freetype Version"
depends on BR2_PACKAGE_FREETYPE
- default BR2_FREETYPE_VERSION_2_2_1
+ default BR2_FREETYPE_VERSION_2_3_7
help
Select the version of Freetype you wish to use.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2009-01-08 8:27 jacmet at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: jacmet at uclibc.org @ 2009-01-08 8:27 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-08 08:27:18 +0000 (Thu, 08 Jan 2009)
New Revision: 24717
Log:
freetype: mark ancient 2.2 version as deprecated
Modified:
trunk/buildroot/package/freetype/Config.in
Changeset:
Modified: trunk/buildroot/package/freetype/Config.in
===================================================================
--- trunk/buildroot/package/freetype/Config.in 2009-01-08 03:35:47 UTC (rev 24716)
+++ trunk/buildroot/package/freetype/Config.in 2009-01-08 08:27:18 UTC (rev 24717)
@@ -15,6 +15,7 @@
config BR2_FREETYPE_VERSION_2_2_1
bool "Freetype 2.2.1"
+ depends on BR2_DEPRECATED
config BR2_FREETYPE_VERSION_2_3_7
bool "Freetype 2.3.7"
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2009-01-16 9:02 laird at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: laird at uclibc.org @ 2009-01-16 9:02 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2009-01-16 09:02:51 +0000 (Fri, 16 Jan 2009)
New Revision: 24865
Log:
package/freetype/freetype.mk: Fix editing of freetype-config
Found that the editing of freetypr-config was not quite enough.
Changed it and looked at freetype-config --cflags, --libs and got the values
I expected.
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2009-01-15 23:19:28 UTC (rev 24864)
+++ trunk/buildroot/package/freetype/freetype.mk 2009-01-16 09:02:51 UTC (rev 24865)
@@ -17,7 +17,10 @@
$(FREETYPE_TARGET_INSTALL_TARGET):
-cp -a $(FREETYPE_DIR)/objs/.libs/libfreetype.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfreetype.so
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(FREETYPE_DIR)/builds/unix/freetype-config
- $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(FREETYPE_DIR)/builds/unix/freetype-config
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+ -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+ -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/freetype2\',g" \
+ -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
+ $(STAGING_DIR)/usr/bin/freetype-config
touch $@
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
2008-11-11 11:33 laird at uclibc.org
@ 2009-01-24 8:28 ` Peter Korsgaard
0 siblings, 0 replies; 27+ messages in thread
From: Peter Korsgaard @ 2009-01-24 8:28 UTC (permalink / raw)
To: buildroot
>>>>> "laird" == laird <laird@uclibc.org> writes:
laird> Author: laird
laird> Date: 2008-11-11 03:33:45 -0800 (Tue, 11 Nov 2008)
laird> New Revision: 23998
laird> Log:
laird> package/freetype/freetype.mk: Add zib to dependencies
laird> Looking into adding a configure cache to the build (like the GIT buildroot version)
laird> This means that freetype needs to know about zlib so make
laird> sure it had it as a dependency.
laird> Also remove install rule for staging as it matches default.
That seems wrong. It should probably be $(if $(BR2_PACKAGE_ZLIB),zlib)
or you should select zlib if freetype really needs it.
laird> -FREETYPE_DEPENDENCIES = uclibc pkgconfig
laird> +FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2009-01-24 8:31 jacmet at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: jacmet at uclibc.org @ 2009-01-24 8:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-24 08:31:22 +0000 (Sat, 24 Jan 2009)
New Revision: 24998
Log:
freetype: only depend on zlib if it is available
The dependency is only there so zlib gets built before freetype if it's
available (for shared configure cache)
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2009-01-24 06:44:17 UTC (rev 24997)
+++ trunk/buildroot/package/freetype/freetype.mk 2009-01-24 08:31:22 UTC (rev 24998)
@@ -4,13 +4,14 @@
#
#############################################################
FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
+#"))
FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_LIBTOOL_PATCH = NO
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = YES
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib
+FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB,zlib)
$(eval $(call AUTOTARGETS,package,freetype))
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/freetype
@ 2009-01-24 10:20 jacmet at uclibc.org
0 siblings, 0 replies; 27+ messages in thread
From: jacmet at uclibc.org @ 2009-01-24 10:20 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-24 10:20:36 +0000 (Sat, 24 Jan 2009)
New Revision: 25001
Log:
freetype: fix typo
Modified:
trunk/buildroot/package/freetype/freetype.mk
Changeset:
Modified: trunk/buildroot/package/freetype/freetype.mk
===================================================================
--- trunk/buildroot/package/freetype/freetype.mk 2009-01-24 10:16:53 UTC (rev 25000)
+++ trunk/buildroot/package/freetype/freetype.mk 2009-01-24 10:20:36 UTC (rev 25001)
@@ -11,7 +11,7 @@
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = YES
FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB,zlib)
+FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib)
$(eval $(call AUTOTARGETS,package,freetype))
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2009-01-24 10:20 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-17 13:20 [Buildroot] svn commit: trunk/buildroot/package/freetype jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-24 10:20 jacmet at uclibc.org
2009-01-24 8:31 jacmet at uclibc.org
2009-01-16 9:02 laird at uclibc.org
2009-01-08 8:27 jacmet at uclibc.org
2008-12-08 13:42 jacmet at uclibc.org
2008-12-08 4:43 hamish at uclibc.org
2008-11-11 11:33 laird at uclibc.org
2009-01-24 8:28 ` Peter Korsgaard
2008-11-10 21:43 hartleys
2008-10-09 12:50 laird at uclibc.org
2008-09-05 1:03 hamish at uclibc.org
2008-09-05 9:52 ` Peter Korsgaard
2008-09-05 12:53 ` Hamish Moffatt
2008-09-05 18:31 ` Peter Korsgaard
2008-09-06 4:22 ` Hamish Moffatt
2008-09-05 17:44 ` danieljlaird at hotmail.com
2008-07-04 2:57 correa at uclibc.org
2008-07-05 19:08 ` Peter Korsgaard
2008-05-22 21:30 ulf at uclibc.org
2008-04-25 16:45 ninevoltz at uclibc.org
2008-03-06 18:10 ninevoltz at uclibc.org
2007-11-16 10:16 vanokuten at uclibc.org
2007-09-23 9:55 ulf at uclibc.org
2007-08-14 6:28 ulf at uclibc.org
2007-01-16 19:51 aldot at uclibc.org
2007-01-10 23:54 andersen at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox