Skip to content

Commit 91d6c5c

Browse files
committed
bootstrap: move jpeg, png, sqlite3 recipes to use official and latest source code, not prepackaged/old/unmaintaned sources.
1 parent 7f9d03e commit 91d6c5c

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

recipes/jpeg/recipe.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
#!/bin/bash
22

3-
VERSION_jpeg=
4-
URL_jpeg=
3+
VERSION_jpeg=${VERSION_jpeg:-9a}
4+
URL_jpeg=http://ijg.org/files/jpegsrc.v$VERSION_jpeg.tar.gz
55
MD5_jpeg=
6-
BUILD_jpeg=$SRC_PATH/jni/jpeg
6+
BUILD_jpeg=$BUILD_PATH/jpeg/$(get_directory $URL_jpeg)
77
RECIPE_jpeg=$RECIPES_PATH/jpeg
88

99
function prebuild_jpeg() {
1010
true
1111
}
1212

1313
function build_jpeg() {
14-
cd $SRC_PATH/jni
14+
cd $BUILD_jpeg
1515
push_arm
16-
try ndk-build V=1 jpeg
16+
try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi
17+
try make
18+
try cp .libs/libjpeg.a $LIBS_PATH
1719
pop_arm
1820
}
1921

recipes/png/recipe.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
#!/bin/bash
22

3-
VERSION_png=
4-
URL_png=
5-
MD5_png=
6-
BUILD_png=$SRC_PATH/jni/png
3+
VERSION_png=${VERSION_png:-1.6.12}
4+
URL_png=http://downloads.sourceforge.net/project/libpng/libpng16/$VERSION_png/libpng-$VERSION_png.tar.gz
5+
MD5_png=297388a6746a65a2127ecdeb1c6e5c82
6+
BUILD_png=$BUILD_PATH/png/$(get_directory $URL_png)
77
RECIPE_png=$RECIPES_PATH/png
88

99
function prebuild_png() {
1010
true
1111
}
1212

1313
function build_png() {
14-
cd $SRC_PATH/jni
14+
cd $BUILD_png
1515
push_arm
16-
try ndk-build V=1 png
16+
try cp scripts/pnglibconf.h.prebuilt pnglibconf.h
17+
try cp scripts/makefile.gcc makefile
18+
try env make CC="$CC"
19+
try cp libpng.a $LIBS_PATH
1720
pop_arm
1821
}
1922

recipes/sqlite3/recipe.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
#!/bin/bash
22

3-
VERSION_sqlite3=3
4-
URL_sqlite3=
3+
VERSION_sqlite3=${VERSION_sqlite3:-3080500}
4+
URL_sqlite3=http://www.sqlite.org/2014/sqlite-autoconf-$VERSION_sqlite3.tar.gz
55
MD5_sqlite3=
6-
BUILD_sqlite3=$SRC_PATH/jni/sqlite3
6+
BUILD_sqlite3=$BUILD_PATH/sqlite3/$(get_directory $URL_sqlite3)
77
RECIPE_sqlite3=$RECIPES_PATH/sqlite3
88

99
function prebuild_sqlite3() {
1010
true
1111
}
1212

1313
function build_sqlite3() {
14-
cd $SRC_PATH/jni
14+
cd $BUILD_sqlite3
1515
push_arm
16-
try ndk-build V=1 sqlite3
16+
try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi
17+
try make
18+
try cp .libs/libsqlite3.so "$LIBS_PATH"
1719
pop_arm
1820
}
1921

0 commit comments

Comments
 (0)