Skip to content

Commit 3a4519b

Browse files
committed
support build for x86_64
1 parent 1cace8f commit 3a4519b

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

build-hnp/Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ PKGS=zstd \
22
zlib \
33
openssl \
44
libidn2 \
5-
c-ares \
6-
curl \
75
wget \
86
pcre2 \
97
libglib \
@@ -24,22 +22,14 @@ harmonix-public.hnp: $(STAMP) Makefile
2422
mkdir -p sysroot/lib
2523

2624
cp -r buildroot/lib/libz.so* sysroot/lib/
27-
cp -r buildroot/lib/libglib-2.0.so* sysroot/lib/
28-
cp -r buildroot/lib/libgmodule-2.0.so* sysroot/lib/
29-
cp -r buildroot/lib/libintl.so* sysroot/lib/
30-
cp -r buildroot/lib/libpcre2-8.so* sysroot/lib/
3125
cp -r buildroot/lib/libssl.so* sysroot/lib/
32-
cp -r buildroot/lib/libcares.so* sysroot/lib/
3326
cp -r buildroot/lib/libidn2.so* sysroot/lib/
3427
cp -r buildroot/lib/libcrypto.so* sysroot/lib/
3528

3629
cp -r buildroot/bin/wget sysroot/bin/hmx_wget
3730
cp -r buildroot/bin/harmonix sysroot/bin/
3831
cp -r buildroot/bin/qemu-* sysroot/bin/
3932

40-
# cp -r buildroot/lib/libcurl.so* sysroot/lib/
41-
# cp -r buildroot/bin/curl sysroot/bin/hmx_curl
42-
4333
# create hnp manually
4434
cp hnp.json sysroot
4535
rm -f harmonix-public.hnp

build-hnp/libglib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ all: download/glib
1818
cd temp/glib && echo "endian = 'little'" >> cross.txt
1919
cd temp/glib && echo "[properties]" >> cross.txt
2020
cd temp/glib && echo "needs_exe_wrapper = true" >> cross.txt
21-
cd temp/glib && PKG_CONFIG=$(shell which pkg-config) PKG_CONFIG_LIBDIR=$(shell pwd)/../buildroot/lib/pkgconfig meson --cross-file cross.txt --prefix=$(PREFIX) -Dselinux=false -Dinstalled_tests=false -Ddtrace=disabled -Dsystemtap=disabled -Dselinux=disabled -Dlibelf=disabled -Dlibmount=disabled -Ddefault_library=both -Dsysprof=disabled build
21+
cd temp/glib && PKG_CONFIG=$(shell which pkg-config) PKG_CONFIG_LIBDIR=$(shell pwd)/../buildroot/lib/pkgconfig meson --cross-file cross.txt --prefix=$(PREFIX) -Dselinux=false -Dinstalled_tests=false -Ddtrace=disabled -Dsystemtap=disabled -Dselinux=disabled -Dlibelf=disabled -Dlibmount=disabled -Ddefault_library=both -Dsysprof=disabled -Ddefault_library=static build
2222
cd temp/glib/build && meson compile
2323
mkdir -p ../buildroot
2424
cd temp/glib/build && DESTDIR=$(shell pwd)/build meson install

build-hnp/openssl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ all: download/openssl-3.5.0.tar.gz
55
mkdir -p temp build/bin
66
cd temp && tar xvf ../download/openssl-3.5.0.tar.gz
77
cd temp/openssl-3.5.0 && cat ../../0001-ohos-getauxval.diff | patch -Np1
8-
cd temp/openssl-3.5.0 && ./Configure linux-$(OHOS_ARCH) shared no-tests --prefix=$(PREFIX) --openssldir=$(PREFIX) -D__OHOS__ CC=$(OHOS_SDK_HOME)/native/llvm/bin/$(OHOS_ARCH)-unknown-linux-ohos-clang AR=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-ar RANLIB=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-ranlib STRIP=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-strip
8+
cd temp/openssl-3.5.0 && ./Configure linux-$(OHOS_ARCH) shared no-tests --prefix=$(PREFIX) --openssldir=$(PREFIX) --libdir=lib -D__OHOS__ CC=$(OHOS_SDK_HOME)/native/llvm/bin/$(OHOS_ARCH)-unknown-linux-ohos-clang AR=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-ar RANLIB=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-ranlib STRIP=$(OHOS_SDK_HOME)/native/llvm/bin/llvm-strip
99
cd temp/openssl-3.5.0 && make -j $(shell nproc)
1010
cd temp/openssl-3.5.0 && make install_sw DESTDIR=$(shell pwd)/build
1111
mkdir -p ../buildroot

0 commit comments

Comments
 (0)