From: James Hilliard <james.hilliard1@gmail.com>
To: buildroot@buildroot.org
Cc: James Hilliard <james.hilliard1@gmail.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build
Date: Wed, 19 Jan 2022 01:45:45 -0700 [thread overview]
Message-ID: <20220119084545.3642950-1-james.hilliard1@gmail.com> (raw)
The cmake build appears to be missing features such as pkg-config
generation support, switch to the regular makefile based build
which appears to work better.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
package/re2/re2.mk | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/package/re2/re2.mk b/package/re2/re2.mk
index b562d5d7ef..144c82339f 100644
--- a/package/re2/re2.mk
+++ b/package/re2/re2.mk
@@ -10,8 +10,30 @@ RE2_LICENSE = BSD-3-Clause
RE2_LICENSE_FILES = LICENSE
RE2_INSTALL_STAGING = YES
-RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF
-HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON
+define RE2_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+ -C $(@D)
+endef
-$(eval $(cmake-package))
-$(eval $(host-cmake-package))
+define RE2_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+ DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install
+endef
+
+define RE2_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+ DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install
+endef
+
+define HOST_RE2_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
+ -C $(@D)
+endef
+
+define HOST_RE2_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
+ -C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2022-01-19 8:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-19 8:45 James Hilliard [this message]
2022-01-19 20:45 ` [Buildroot] [PATCH 1/1] package/re2: switch to generic-package make build Yann E. MORIN
2022-01-20 0:42 ` James Hilliard
2022-01-20 21:29 ` Peter Seiderer
2022-01-20 23:57 ` James Hilliard
2022-01-21 6:58 ` Yann E. MORIN
2022-01-21 7:41 ` Thomas Petazzoni
2022-01-21 7:59 ` Yann E. MORIN
2022-01-21 13:26 ` Thomas Petazzoni
2022-01-21 21:16 ` James Hilliard
2022-01-21 9:17 ` James Hilliard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220119084545.3642950-1-james.hilliard1@gmail.com \
--to=james.hilliard1@gmail.com \
--cc=buildroot@buildroot.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox