diff options
author | Al Stone <ahs3@redhat.com> | 2012-12-19 19:27:05 -0700 |
---|---|---|
committer | Al Stone <ahs3@redhat.com> | 2012-12-19 19:27:05 -0700 |
commit | 6035f11251e0fb6f393b28d960bb3be230c2abf5 (patch) | |
tree | bb912ab407ced7a8389551f70c329eb191a2e881 | |
parent | af2eefb952f8b158d533b0fc5334fd6770ec9cf9 (diff) | |
parent | e0ef34602917e5aec0b1ab7d13bd781f6e01f366 (diff) | |
download | bootstrap.git.DONOTUSE-6035f11251e0fb6f393b28d960bb3be230c2abf5.tar.gz bootstrap.git.DONOTUSE-6035f11251e0fb6f393b28d960bb3be230c2abf5.tar.xz bootstrap.git.DONOTUSE-6035f11251e0fb6f393b28d960bb3be230c2abf5.zip |
Merge branch 'aarch64-ahs3'
-rw-r--r-- | recipe.d/0023-glib2 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipe.d/0023-glib2 b/recipe.d/0023-glib2 index 4863a80..8132f93 100644 --- a/recipe.d/0023-glib2 +++ b/recipe.d/0023-glib2 @@ -8,9 +8,10 @@ # glib2 expects --enable-threads=yes to enable threads, # anything else disables threads - GIO=`cd $SRC/glib-*/gio; pwd` - sed 's@gdbus-2.0/codegen@@g' $GIO/Makefile.in | sed 's/ tests$//' > $GIO/Makefile.stage2 - mv $GIO/Makefile.stage2 $GIO/Makefile.in +#-- this sed no longer works; i've patched Makefile.in directly instead +# GIO=`cd $SRC/glib-*/gio; pwd` +# sed 's@gdbus-2.0/codegen@@g' $GIO/Makefile.in | sed 's/ tests$//' > $GIO/Makefile.stage2 +# mv $GIO/Makefile.stage2 $GIO/Makefile.in $SRC/glib-*/configure `echo $TCONFIGARGS | sed 's/posix/yes/'` --enable-static make $J |