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

Unified Diff: ports/glib/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: fix wrong c++ lib 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
« no previous file with comments | « ports/cairo/build.sh ('k') | ports/glibc-compat/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/glib/build.sh
diff --git a/ports/glib/build.sh b/ports/glib/build.sh
index 9b75df6b742c26c6159050f8da30941472c9792d..feae2e3f99915b0df4d17cfe4f53b1b0bbf58fdc 100644
--- a/ports/glib/build.sh
+++ b/ports/glib/build.sh
@@ -61,3 +61,16 @@ ConfigureStep() {
--${NACL_OPTION}-sse2 \
--${NACL_OPTION}-asm
}
+
+InstallStep() {
+ DefaultInstallStep
+ # fix pkgconfig files to explicitly include libffi
+ # for things that depend on glib
+ sed -i 's/-lglib-2.0 -lintl/-lglib-2.0 -lffi -lintl/'\
+ ${INSTALL_DIR}/naclports-dummydir/lib/pkgconfig/glib-2.0.pc
+
+ if [ "${NACL_LIBC}" = "newlib" ]; then
+ sed -i 's/-lffi -lintl/-lffi -lglibc-compat -lintl/'\
+ ${INSTALL_DIR}/naclports-dummydir/lib/pkgconfig/glib-2.0.pc
+ fi
+}
« no previous file with comments | « ports/cairo/build.sh ('k') | ports/glibc-compat/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698