Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ports/gtk+/build.sh

Issue 1260083004: Add needed functions to glibc-compat for pkg (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: try to fix gtk+ Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ports/cairo/build.sh ('K') | « ports/glibc-compat/src/writev.c ('k') | ports/libx11/build.sh » ('j') | ports/libx11/build.sh » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/gtk+/build.sh
diff --git a/ports/gtk+/build.sh b/ports/gtk+/build.sh
index 599739f726a1c16b56bdae81303434b8770eb46f..19eceed8d6b87c582cf64afddd9942dec2a031f5 100644
--- a/ports/gtk+/build.sh
+++ b/ports/gtk+/build.sh
@@ -5,7 +5,7 @@
ConfigureStep() {
if [ "${NACL_LIBC}" = "newlib" ]; then
# newlib requires different library order to deal with static libraries
- export LIBS+=" -lXext -lX11 -lxcb -lXau"
+ export LIBS+=" -lXext -lX11 -lxcb -lXau -lglibc-compat"
NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
fi
@@ -14,6 +14,11 @@ ConfigureStep() {
sed -i 's/-lglib-2.0 -lintl/-lglib-2.0 -lffi -lintl/'\
${NACLPORTS_LIBDIR}/pkgconfig/glib-2.0.pc
+ if [ "${NACL_LIBC}" = "newlib" ]; then
+ sed -i 's/-lffi -lintl/-lffi -lglibc-compat -lintl/'\
+ ${NACLPORTS_LIBDIR}/pkgconfig/glib-2.0.pc
Sam Clegg 2015/07/31 22:07:00 This should go in the InstallStep of the glib pack
zhitingzhu 2015/08/01 00:48:15 Done.
+ fi
+
EXTRA_CONFIGURE_ARGS+=" --disable-shm --enable-explicit-deps --disable-cups \
--enable-gtk-doc-html=no"
« ports/cairo/build.sh ('K') | « ports/glibc-compat/src/writev.c ('k') | ports/libx11/build.sh » ('j') | ports/libx11/build.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698