summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-12 19:42:52 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-12 19:42:52 (GMT)
commit3686578b60603f55b5bd2c774f0066ea219e627d (patch)
treeddbe4223a8ab3bcb995b3c1b8b1ace742345f03e
parent308fc79fcf997737d3bae757046bfd981c75489e (diff)
parent8fbf8c393ecabfa1dd29eb53ba32b9a642584562 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/font-bh-100dpi/Makefile1
-rw-r--r--package/font-bh-75dpi/Makefile1
-rw-r--r--package/font-bh-lucidatypewriter-100dpi/Makefile1
-rw-r--r--package/font-bh-lucidatypewriter-75dpi/Makefile1
-rw-r--r--package/font-bh-ttf/Makefile1
-rw-r--r--package/font-bh-type1/Makefile1
-rw-r--r--package/font-bitstream-100dpi/Makefile1
-rw-r--r--package/font-bitstream-75dpi/Makefile1
-rw-r--r--package/font-bitstream-type1/Makefile1
-rw-r--r--package/font-xfree86-type1/Makefile1
-rw-r--r--package/glib/Makefile24
-rw-r--r--scripts/scan-pkgs.sh12
12 files changed, 33 insertions, 13 deletions
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index fc0b6c2..94c9288 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= d9383b2ddda241a464343b7b4de370a9
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index 645aac5..7aaaba5 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 200b38e879dcbf922ca2a9f71ad44657
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index 8df46f8..443eb47 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 8fa38b7845c10ff83d6077a1e238b15b
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index 271fe18..ebe5555 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= f36b68aabef2d57258131ce6136c6f50
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index e36e871..fd0872f 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= baea1bb10808857e595f13c6be9cbfbe
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 3cba714..d9c2ab9 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 000da66f92370ac59e3df1b6719fdd9a
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index a65b12d..20c1c79 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 823c3c2a1a2307bdca5961145e3db37d
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index 40f4cec..2bb5c8b 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= f8e982bcaaed199fdac03e9fc12b2952
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index 97e8ada..654aea3 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 08722299c09753a5540a0752ec5b5fc7
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index 2a08c9b..559bbb4 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 785f2b6e8d6d0dafec08b8d4c54ae2e3
PKG_DESCR:= X fonts
PKG_SECTION:= x11/fonts
+PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
diff --git a/package/glib/Makefile b/package/glib/Makefile
index c8ae307..3b06f2c 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -25,8 +25,8 @@ $(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
CONFIGURE_ARGS+= --enable-debug=no \
--disable-mem-pools \
--disable-rebuilds \
- --with-libiconv=gnu \
--disable-fam \
+ --with-libiconv=gnu \
--with-threads=posix
CONFIGURE_ENV+= glib_cv_long_long_format=ll \
glib_cv_stack_grows=no \
@@ -35,6 +35,28 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \
ac_cv_func_posix_getpwuid_r=yes \
ac_cv_func_posix_getgrgid_r=yes
+ifeq ($(ADK_HOST_CYGWIN),y)
+EXEEXT:= .exe
+endif
+
+pre-configure:
+ (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
+ env CFLAGS="-static" LDFLAGS="-static" \
+ ./configure --prefix=$(STAGING_HOST_DIR) \
+ $(CONFIGURE_ARGS) \
+ --with-libiconv=no \
+ --with-threads=posix \
+ --enable-static \
+ --disable-shared \
+ );
+ ${MAKE} -C ${WRKBUILD}/glib
+ ${MAKE} -C ${WRKBUILD}/gthread
+ ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas
+ ${MAKE} -C ${WRKBUILD}/gobject glib-genmarshal
+ $(CP) ${WRKBUILD}/gio/glib-compile-schemas ${STAGING_HOST_DIR}/bin
+ $(CP) ${WRKBUILD}/gobject/glib-genmarshal ${STAGING_HOST_DIR}/bin
+ ${MAKE} -C ${WRKBUILD} clean
+
post-install:
${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index b08cafc..a7b3cf4 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -85,11 +85,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
NEED_INTL="$NEED_INTL xkeyboard-config"
fi
-if [[ -n $ADK_PACKAGE_GLIB ]]; then
- NEED_GLIBZWO="$NEED_GLIBZWO glib"
- NEED_GETTEXT="$NEED_GETTEXT glib"
-fi
-
if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then
NEED_FLEX="$NEED_FLEX libpcap"
NEED_BISON="$NEED_BISON libpcap"
@@ -269,13 +264,6 @@ if [[ -n $NEED_XKBCOMP ]]; then
fi
fi
-if [[ -n $NEED_GLIBZWO ]]; then
- if ! which glib-genmarshal >/dev/null 2>&1; then
- echo >&2 You need libglib2.0-dev to build $NEED_GLIBZWO
- out=1
- fi
-fi
-
if [[ -n $NEED_RPM ]]; then
if ! which rpmbuild >/dev/null 2>&1; then
echo >&2 You need rpmbuild to to use $NEED_RPM package backend