[PATCH 1/2] Filter newlines from BUILD_REQUIRES

[PATCH 1/2] Filter newlines from BUILD_REQUIRES

[Corinna Vinschen]

From: Corinna Vinschen <corinna@vinschen.de>

BUILD_REQUIRES is added verbatim to the build-depends: line in
the *-src.hint file.  If the cygport file defines BUILD_REQUIRES
with spaces, e. g.

  BUILD_REQUIRES="
    a
    b
  "

The -src.hint file is broken.  Avoid this by filtering out any
newline's from BUILD_REQUIRES before using it in the subsequent
expression building the -src.hint file.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 lib/pkg_pkg.cygpart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index 82112e1cfc79..eb06a08dd562 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -544,6 +544,10 @@ __pkg_srcpkg() {
 		elif [ -n "${!pkg_category_var:-${CATEGORY}}" \
 			-a -n "${!pkg_summary_var:-${SUMMARY}}${!pkg_description_var:-${DESCRIPTION}}" ]
 		then
+			# BUILD_REQUIRES is added to the build-depends: line
+			# in the hint file written below.  Convert LFs to
+			# spaces to make sure it's actually a single line.
+			BUILD_REQUIRES=$(echo -n "$BUILD_REQUIRES" | tr '\n' ' ')
 			cat > ${distdir}/${PN}/${PN}-${PVR}-src.hint <<-_EOF
 category: ${!pkg_category_var:-${CATEGORY}}
 build-depends: cygport ${BUILD_REQUIRES}
-- 
2.38.1

[PATCH 2/2] Default to x86_64 build on non-Cygwin hosts

[Corinna Vinschen]

From: Corinna Vinschen <corinna@vinschen.de>

Given x86 has been deprecated, we only have a single target for
the time being.  Default to this target for now, basically to
safe my lazy ass when building on Linux.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 NEWS                  | 3 +++
 lib/compilers.cygpart | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 976237d88d54..e3dc83c3f5a4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.35.5:
+	* Default to x86_64-pc-cygwin target on Linux.
+
 0.35.4:
 	* Replace 'egrep' with 'grep -E' throughout
 	* xorg: Default LICENSE to 'MIT'
diff --git a/lib/compilers.cygpart b/lib/compilers.cygpart
index f9b8c69532e2..35e6fe2886f9 100644
--- a/lib/compilers.cygpart
+++ b/lib/compilers.cygpart
@@ -213,7 +213,7 @@ case ${CBUILD} in
 # https://sourceware.org/legacy-ml/cygwin-developers/2013-02/msg00132.html
 x86_64-unknown-cygwin)  CBUILD="x86_64-pc-cygwin" ;&
 *-cygwin)  CHOST="${_host_arch:-${CBUILD%%-*}}-pc-cygwin" ;;
-*)         defined _host_arch || error "Either --32 or --64 flags MUST be passed to cygport"
+*)         defined _host_arch || _host_arch="x86_64"
            CHOST="${_host_arch}-pc-cygwin" ;;
 esac
 unset _host_arch
-- 
2.38.1

Re: [PATCH 2/2] Default to x86_64 build on non-Cygwin hosts

[Jon Turney]

On 03/12/2022 16:14, Corinna Vinschen via Cygwin-apps wrote:
> From: Corinna Vinschen <corinna-fFDxGeQsSAIb1SvskN2V4Q@public.gmane.org>
> 
> Given x86 has been deprecated, we only have a single target for
> the time being.  Default to this target for now, basically to
> safe my lazy ass when building on Linux.
Thanks, applied.