Re: [PATCH v2] openssl: use --cross-compile-prefix in Configure

2020-11-28 Thread Rosen Penev
On Sat, Nov 28, 2020 at 1:06 PM Eneas U de Queiroz
 wrote:
>
> This sets the --cross-compile-prefix option when running Configure, so
> that that it will not use the host gcc to figure out, among other
> things, compiler defines.  It avoids errors, if the host 'gcc' is
> handled by clang:
>
> mips-openwrt-linux-musl-gcc: error: unrecognized command-line option
> '-Qunused-arguments'
>
> Signed-off-by: Eneas U de Queiroz 
Tested-by: Rosen Penev 
>
> ---
> neheb, or anyone else affected, please test this patch to see if what
> I'm claiming is actually true.  At least it does not appear to break
> compilation in my case ;-)
works here as well. Fedora 32.
>
> Compile-tested using a Gentoo host, and mvebu as target.
>
> Changelog
>
> v1 -> v2
> Since the cross prefix is set in Configure, we don't need to overide
> it when calling make
>
> diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
> index 9696748106..77c6d41cec 100644
> --- a/package/libs/openssl/Makefile
> +++ b/package/libs/openssl/Makefile
> @@ -11,7 +11,7 @@ PKG_NAME:=openssl
>  PKG_BASE:=1.1.1
>  PKG_BUGFIX:=h
>  PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
> -PKG_RELEASE:=1
> +PKG_RELEASE:=2
>  PKG_USE_MIPS16:=0
>  ENGINES_DIR=engines-1.1
>
> @@ -333,6 +333,7 @@ define Build/Configure
> --prefix=/usr \
> --libdir=lib \
> --openssldir=/etc/ssl \
> +   --cross-compile-prefix="$(TARGET_CROSS)" \
> $(TARGET_CPPFLAGS) \
> $(TARGET_LDFLAGS) \
> $(OPENSSL_OPTIONS) && \
> @@ -345,14 +346,12 @@ TARGET_LDFLAGS += -Wl,--gc-sections
>
>  define Build/Compile
> +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
> -   CROSS_COMPILE="$(TARGET_CROSS)" \
> CC="$(TARGET_CC)" \
> SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
> OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
> $(OPENSSL_MAKEFLAGS) \
> all
> $(MAKE) -C $(PKG_BUILD_DIR) \
> -   CROSS_COMPILE="$(TARGET_CROSS)" \
> CC="$(TARGET_CC)" \
> DESTDIR="$(PKG_INSTALL_DIR)" \
> $(OPENSSL_MAKEFLAGS) \

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[PATCH v2] openssl: use --cross-compile-prefix in Configure

2020-11-28 Thread Eneas U de Queiroz
This sets the --cross-compile-prefix option when running Configure, so
that that it will not use the host gcc to figure out, among other
things, compiler defines.  It avoids errors, if the host 'gcc' is
handled by clang:

mips-openwrt-linux-musl-gcc: error: unrecognized command-line option
'-Qunused-arguments'

Signed-off-by: Eneas U de Queiroz 

---
neheb, or anyone else affected, please test this patch to see if what
I'm claiming is actually true.  At least it does not appear to break
compilation in my case ;-)

Compile-tested using a Gentoo host, and mvebu as target.

Changelog

v1 -> v2
Since the cross prefix is set in Configure, we don't need to overide
it when calling make

diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index 9696748106..77c6d41cec 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=openssl
 PKG_BASE:=1.1.1
 PKG_BUGFIX:=h
 PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 ENGINES_DIR=engines-1.1
 
@@ -333,6 +333,7 @@ define Build/Configure
--prefix=/usr \
--libdir=lib \
--openssldir=/etc/ssl \
+   --cross-compile-prefix="$(TARGET_CROSS)" \
$(TARGET_CPPFLAGS) \
$(TARGET_LDFLAGS) \
$(OPENSSL_OPTIONS) && \
@@ -345,14 +346,12 @@ TARGET_LDFLAGS += -Wl,--gc-sections
 
 define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-   CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \
SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
$(OPENSSL_MAKEFLAGS) \
all
$(MAKE) -C $(PKG_BUILD_DIR) \
-   CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
$(OPENSSL_MAKEFLAGS) \

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel