mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 07:37:14 +00:00
+25
@@ -0,0 +1,25 @@
|
|||||||
|
From 53ca110d53ca82f6c4224e4c29dbcf7dfe6914cd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Tue, 23 Aug 2022 00:25:06 -0700
|
||||||
|
Subject: [PATCH] Forward port defining PREFIX_BINDIR to use new autoconf
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
configure.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index c3ef568..a320c56 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -44,7 +44,7 @@ wi_EXTRA_SYSV_SUNOS_DIRS dnl For better curses library on SunOS 4
|
||||||
|
|
||||||
|
dnl Try to use PATH rather than hardcode the installation path, if possible.
|
||||||
|
if test "${prefix-NONE}" != "NONE" && test "$prefix" != "/usr/local" && test "$prefix" != "/usr"; then
|
||||||
|
- AC_DEFINE_UNQUOTED(PREFIX_BINDIR, "$prefix/bin")
|
||||||
|
+ AC_DEFINE([PREFIX_BINDIR], [${prefix}/bin], [Install bindir])
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -16,13 +16,9 @@ Other solution would to fix sed.sh to ignore double definitions
|
|||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
|
|
||||||
Signed-of-by: Khem Raj <raj.khem@gmail.com>
|
Signed-of-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
--- a/autoconf_local/aclocal.m4
|
||||||
|
+++ b/autoconf_local/aclocal.m4
|
||||||
Index: ncftp-3.2.6/configure
|
@@ -4220,7 +4220,6 @@ changequote({{, }})dnl
|
||||||
===================================================================
|
|
||||||
--- ncftp-3.2.6.orig/configure
|
|
||||||
+++ ncftp-3.2.6/configure
|
|
||||||
@@ -7859,7 +7859,6 @@ chmod 755 "$wi_tmpdir/prpp.pl"
|
|
||||||
cat << 'EOF' > "$wi_tmpdir/unistd.c"
|
cat << 'EOF' > "$wi_tmpdir/unistd.c"
|
||||||
#include <confdefs.h>
|
#include <confdefs.h>
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \
|
|||||||
file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
|
file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
|
||||||
file://unistd.patch \
|
file://unistd.patch \
|
||||||
file://ncftp-3.2.5-gcc10.patch \
|
file://ncftp-3.2.5-gcc10.patch \
|
||||||
"
|
file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \
|
||||||
|
"
|
||||||
SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f"
|
SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f"
|
||||||
SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"
|
SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"
|
||||||
|
|
||||||
@@ -20,14 +21,10 @@ CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall"
|
|||||||
PACKAGECONFIG ??= ""
|
PACKAGECONFIG ??= ""
|
||||||
PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,,"
|
PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,,"
|
||||||
|
|
||||||
EXTRA_OECONF = "--disable-precomp"
|
EXTRA_OECONF = "--disable-precomp --disable-universal"
|
||||||
TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}"
|
#TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}"
|
||||||
|
ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local"
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
|
|
||||||
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
|
|
||||||
oe_runconf
|
|
||||||
}
|
|
||||||
do_install () {
|
do_install () {
|
||||||
install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
|
install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
|
||||||
oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
|
oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
|
||||||
|
|||||||
Reference in New Issue
Block a user