* [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/musl/
@ 2012-04-25 23:27 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-04-25 23:27 UTC (permalink / raw
To: gentoo-commits
commit: dd676f0d5b1ed104813170a0c658a123471103f8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 23:25:49 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 23:25:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=dd676f0d
sys-libs/musl: initial commit
(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
sys-libs/musl/metadata.xml | 9 +++++++++
sys-libs/musl/musl-0.8.9.ebuild | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/sys-libs/musl/metadata.xml b/sys-libs/musl/metadata.xml
new file mode 100644
index 0000000..e217c37
--- /dev/null
+++ b/sys-libs/musl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>hardened</herd>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/sys-libs/musl/musl-0.8.9.ebuild b/sys-libs/musl/musl-0.8.9.ebuild
new file mode 100644
index 0000000..5c801cf
--- /dev/null
+++ b/sys-libs/musl/musl-0.8.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
+
+EAPI="4"
+
+DESCRIPTION="A new standard library of Linux-based devices"
+HOMEPAGE="http://www.etalabs.net/musl/"
+SRC_URI="http://www.etalabs.net/musl/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND=""
+DEPEND=""
+
+src_configure() {
+ case ${ARCH} in
+ x86)
+ #do nothing, i386 is the default
+ ;;
+ amd64)
+ sed -i -e "s|^ARCH = i386|ARCH = x86_64|" config.mak
+ ;;
+ arm)
+ sed -i -e "s|^ARCH = i386|ARCH = arm|" config.mak
+ ;;
+ *)
+ eerror "${ARCH} is not supported"
+ esac
+
+ sed -i -e "s|^prefix = /usr/local/musl|prefix = /usr|" config.mak
+ sed -i -e "s|^exec_prefix = /usr/local|exec_prefix = /usr|" config.mak
+ echo "LDFLAGS += -Wl,--hash-style,both" >> config.mak
+ echo "CFLAGS += -fno-stack-protector" >> config.mak
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/musl/
@ 2012-07-28 19:33 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-07-28 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 491efe66914672aa7a2663850128580a3c7a66c8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 19:33:05 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 19:33:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=491efe66
sys-libs/musl: updated to 0.9.2
(Portage version: 2.1.10.65/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
sys-libs/musl/musl-0.8.9.ebuild | 39 ---------------------------------------
sys-libs/musl/musl-0.9.2.ebuild | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 39 deletions(-)
diff --git a/sys-libs/musl/musl-0.8.9.ebuild b/sys-libs/musl/musl-0.8.9.ebuild
deleted file mode 100644
index 5c801cf..0000000
--- a/sys-libs/musl/musl-0.8.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
-
-EAPI="4"
-
-DESCRIPTION="A new standard library of Linux-based devices"
-HOMEPAGE="http://www.etalabs.net/musl/"
-SRC_URI="http://www.etalabs.net/musl/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND=""
-DEPEND=""
-
-src_configure() {
- case ${ARCH} in
- x86)
- #do nothing, i386 is the default
- ;;
- amd64)
- sed -i -e "s|^ARCH = i386|ARCH = x86_64|" config.mak
- ;;
- arm)
- sed -i -e "s|^ARCH = i386|ARCH = arm|" config.mak
- ;;
- *)
- eerror "${ARCH} is not supported"
- esac
-
- sed -i -e "s|^prefix = /usr/local/musl|prefix = /usr|" config.mak
- sed -i -e "s|^exec_prefix = /usr/local|exec_prefix = /usr|" config.mak
- echo "LDFLAGS += -Wl,--hash-style,both" >> config.mak
- echo "CFLAGS += -fno-stack-protector" >> config.mak
-}
diff --git a/sys-libs/musl/musl-0.9.2.ebuild b/sys-libs/musl/musl-0.9.2.ebuild
new file mode 100644
index 0000000..c1c9be4
--- /dev/null
+++ b/sys-libs/musl/musl-0.9.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
+
+EAPI="4"
+
+DESCRIPTION="A new standard library of Linux-based devices"
+HOMEPAGE="http://www.etalabs.net/musl/"
+SRC_URI="http://www.etalabs.net/musl/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND=""
+DEPEND=""
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/musl/
@ 2012-07-29 2:36 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-07-29 2:36 UTC (permalink / raw
To: gentoo-commits
commit: 2acf84588541397e9610de9dc2d8a4955bed534f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 29 02:36:44 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul 29 02:36:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=2acf8458
sys-libs/musl: add logic for native vs alternative C lib configurations
---
sys-libs/musl/musl-0.9.2.ebuild | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/sys-libs/musl/musl-0.9.2.ebuild b/sys-libs/musl/musl-0.9.2.ebuild
index c1c9be4..229e3ab 100644
--- a/sys-libs/musl/musl-0.9.2.ebuild
+++ b/sys-libs/musl/musl-0.9.2.ebuild
@@ -16,3 +16,27 @@ RESTRICT="strip"
RDEPEND=""
DEPEND=""
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+do_native_config() {
+ einfo "Installing ${PN} as a native C library"
+ econf --prefix=/usr --disable-gcc-wrapper
+}
+
+do_alternative_config() {
+ einfo "Installing ${PN} as an alternative C library"
+ econf --prefix=/usr/musl
+}
+
+src_configure() {
+ if [ ${CTARGET} == ${CHOST} ] ; then
+ case ${CHOST} in
+ *-musl*) do_native_config ;;
+ *) do_alternative_config ;;
+ esac
+ else
+ die "TODO: set up cross compiling"
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/musl/
@ 2012-08-03 11:10 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-08-03 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 99558707ca5d981029123808f9ba97cc9ee8bbce
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 3 11:08:12 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Aug 3 11:08:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=99558707
sys-libs/musl: version bump
---
.../musl/{musl-0.9.2.ebuild => musl-0.9.3.ebuild} | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/sys-libs/musl/musl-0.9.2.ebuild b/sys-libs/musl/musl-0.9.3.ebuild
similarity index 96%
rename from sys-libs/musl/musl-0.9.2.ebuild
rename to sys-libs/musl/musl-0.9.3.ebuild
index 229e3ab..b437479 100644
--- a/sys-libs/musl/musl-0.9.2.ebuild
+++ b/sys-libs/musl/musl-0.9.3.ebuild
@@ -17,7 +17,6 @@ RESTRICT="strip"
RDEPEND=""
DEPEND=""
-export CBUILD=${CBUILD:-${CHOST}}
export CTARGET=${CTARGET:-${CHOST}}
do_native_config() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/musl/
@ 2012-08-03 16:20 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-08-03 16:20 UTC (permalink / raw
To: gentoo-commits
commit: db2cf87c6e74c14d8a4f2cbda1d9f530d2201492
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 3 16:20:02 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Aug 3 16:20:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=db2cf87c
sys-libs/musl: move libs and gcc wrapper
---
sys-libs/musl/musl-0.9.3.ebuild | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/sys-libs/musl/musl-0.9.3.ebuild b/sys-libs/musl/musl-0.9.3.ebuild
index b437479..31f921d 100644
--- a/sys-libs/musl/musl-0.9.3.ebuild
+++ b/sys-libs/musl/musl-0.9.3.ebuild
@@ -19,6 +19,8 @@ DEPEND=""
export CTARGET=${CTARGET:-${CHOST}}
+MUSLLIBS="lib/musl"
+
do_native_config() {
einfo "Installing ${PN} as a native C library"
econf --prefix=/usr --disable-gcc-wrapper
@@ -26,7 +28,7 @@ do_native_config() {
do_alternative_config() {
einfo "Installing ${PN} as an alternative C library"
- econf --prefix=/usr/musl
+ econf --prefix=/usr/"${MUSLLIBS}"
}
src_configure() {
@@ -39,3 +41,9 @@ src_configure() {
die "TODO: set up cross compiling"
fi
}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ mkdir "${D}"/usr/bin/
+ ln -s "../${MUSLLIBS}"/bin/musl-gcc "${D}"/usr/bin/
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-08-03 16:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-03 16:20 [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/musl/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-08-03 11:10 Anthony G. Basile
2012-07-29 2:36 Anthony G. Basile
2012-07-28 19:33 Anthony G. Basile
2012-04-25 23:27 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox