Compiles up to bin/sed
This commit is contained in:
Nathan Fisher
parent
32b827061c
commit
c037071164
|
|
@ -73,6 +73,7 @@ mpc-${mpc_version}.tar.gz \
|
|||
mpfr-${mpfr_version}.tar.xz \
|
||||
musl-$(musl_version).tar.gz \
|
||||
musl-fts-$(musl-fts_version).tar.gz \
|
||||
musl-obstack-$(musl-obstack_version).tar.gz \
|
||||
openssl-${openssl_version}.tar.gz \
|
||||
ncurses-${ncurses_version}.tar.gz \
|
||||
netbsd-curses-${netbsd-curses_version}.tar.xz \
|
||||
|
|
@ -432,6 +433,12 @@ musl-fts-$(musl-fts_version).tar.gz:
|
|||
wget -c $(github)/void-linux/musl-fts/archive/v$(musl-fts_version).tar.gz \
|
||||
-O $@
|
||||
|
||||
musl-obstack: musl-obstack-$(musl-obstack_version).tar.gz
|
||||
|
||||
musl-obstack-$(musl-obstack_version).tar.gz:
|
||||
wget -c $(github)/void-linux/musl-obstack/archive/v$(musl-obstack_version).tar.gz \
|
||||
-O $@
|
||||
|
||||
ncurses: ncurses-${ncurses_version}.tar.gz
|
||||
|
||||
ncurses-${ncurses_version}.tar.gz:
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ $(objdir):
|
|||
install -d $(objdir)
|
||||
|
||||
install: $(libdir)/$(staticlib)
|
||||
$(post_install)
|
||||
|
||||
$(libdir)/$(staticlib): $(staticlib) | $(libdir)
|
||||
install $< $@
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@ ifeq ($(filter armv7l aarch64, $(bld_arch)), $(bld_arch))
|
|||
else
|
||||
bld = $(bld_arch)-unknown-linux-gnu
|
||||
endif
|
||||
#ifeq ($(filter armv6 armv7l aarch64, $(arch)), $(arch))
|
||||
#tgt = $(arch)-hitchhiker-linux-musleabihf
|
||||
#else
|
||||
#tgt = $(arch)-hitchhiker-linux-musl
|
||||
#endif
|
||||
#bld = $(shell gcc -dumpmachine)
|
||||
ifeq ($(filter armv6 armv7l aarch64, $(arch)), $(arch))
|
||||
tgt = $(arch)-hitchhiker-linux-musleabihf
|
||||
else
|
||||
tgt = $(arch)-hitchhiker-linux-musl
|
||||
endif
|
||||
bld = $(shell gcc -dumpmachine)
|
||||
|
||||
exec_prefix ?= ${DESTDIR}${install_prefix}
|
||||
bindir ?= ${exec_prefix}/bin
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ mpc_version = 1.2.1
|
|||
mpfr_version = 4.1.0
|
||||
musl_version = 1.2.2
|
||||
musl-fts_version = 1.2.7
|
||||
musl-obstack_version = 1.2.3
|
||||
ncurses_version = 6.3
|
||||
netbsd-curses_version = 0.3.1
|
||||
ninja_version = 1.11.0
|
||||
|
|
@ -79,7 +80,7 @@ perl-cross_version = 1.3.5
|
|||
pkg-config_version = 0.29.2
|
||||
pkgsrc_version = 2022Q2
|
||||
procps-ng_version = 3.3.16
|
||||
psmisc_version = 23.5
|
||||
psmisc_version = 23.6
|
||||
python_version = 3.10.6
|
||||
s6_version = 2.11.1.2
|
||||
s6-linux-init_version = 1.0.8.0
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ endif
|
|||
subdirs += binutils
|
||||
subdirs += gcc-pass1
|
||||
subdirs += linux-headers
|
||||
subdirs += glibc
|
||||
#subdirs += musl
|
||||
#subdirs += glibc
|
||||
subdirs += musl
|
||||
subdirs += gcc-pass2
|
||||
|
||||
installdirs += $(tooldir) $(global_srcdir) $(global_objdir)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,11 @@ subdirs += expat
|
|||
subdirs += kmod
|
||||
subdirs += gettext
|
||||
# for musl
|
||||
#subdirs += argp-standalone
|
||||
subdirs += argp-standalone
|
||||
# for musl
|
||||
subdirs += musl-fts
|
||||
# for musl
|
||||
subdirs += musl-obstack
|
||||
subdirs += elfutils
|
||||
subdirs += libffi
|
||||
subdirs += gawk
|
||||
|
|
@ -67,8 +71,6 @@ subdirs += mandoc
|
|||
subdirs += texinfo
|
||||
subdirs += procps-ng
|
||||
subdirs += util-linux
|
||||
# for musl
|
||||
#subdirs += musl-fts
|
||||
subdirs += e2fsprogs
|
||||
#subdirs += haveged
|
||||
subdirs += eudev
|
||||
|
|
|
|||
|
|
@ -6,4 +6,9 @@ doinstall = true
|
|||
cflags += -O2
|
||||
cflags += -Wall
|
||||
cflags += --sysroot=$(DESTDIR)
|
||||
|
||||
define post_install
|
||||
install -m644 src/argp.h $(DESTDIR)/usr/include
|
||||
endef
|
||||
|
||||
include hhl.staticlib.mk
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
||||
#
|
||||
distname = bc
|
||||
patches += bc-sysroot.patch
|
||||
include world.mk
|
||||
export PREFIX = /usr
|
||||
export CC = $(tgt)-gcc
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
diff -Naur bc-6.0.1.orig/Makefile.in bc-6.0.1/Makefile.in
|
||||
--- bc-6.0.1.orig/Makefile.in 2022-12-28 23:57:08.827199555 -0500
|
||||
+++ bc-6.0.1/Makefile.in 2022-12-28 23:58:23.690714654 -0500
|
||||
@@ -211,8 +211,8 @@
|
||||
CPPFLAGS7 = $(CPPFLAGS6) -D$(BC_ENABLE_EXTRA_MATH_NAME)=$(BC_ENABLE_EXTRA_MATH)
|
||||
CPPFLAGS8 = $(CPPFLAGS7) -DBC_ENABLE_HISTORY=$(BC_ENABLE_HISTORY) -DBC_ENABLE_LIBRARY=$(BC_ENABLE_LIBRARY)
|
||||
CPPFLAGS = $(CPPFLAGS8) -DBC_ENABLE_MEMCHECK=$(BC_ENABLE_MEMCHECK) -DBC_ENABLE_AFL=$(BC_ENABLE_AFL)
|
||||
-CFLAGS = $(CPPFLAGS) $(BC_DEFS) $(DC_DEFS) %%CPPFLAGS%% %%CFLAGS%% -I$(INCLUDEDIR)
|
||||
-LDFLAGS = %%LDFLAGS%% -L$(LIBDIR)
|
||||
+CFLAGS = $(CPPFLAGS) $(BC_DEFS) $(DC_DEFS) %%CPPFLAGS%% %%CFLAGS%% -I$(DESTDIR)$(INCLUDEDIR)
|
||||
+LDFLAGS = %%LDFLAGS%% -L$(DESTDIR)$(LIBDIR)
|
||||
|
||||
HOSTCFLAGS = %%HOSTCFLAGS%%
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
progname = grep
|
||||
cflags += -Wno-format-nonliteral
|
||||
libs = -lbz2 -lz
|
||||
libs = -lbz2 -lfts -lz
|
||||
|
||||
binlinks += ${bindir}/egrep
|
||||
binlinks += ${bindir}/fgrep
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ __RCSID("$NetBSD: grep.c,v 1.15 2018/08/12 09:03:21 christos Exp $");
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define REG_STARTEND (1 << 2)
|
||||
|
||||
#include <bsd/compat.h>
|
||||
#include "grep.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
__RCSID("$NetBSD: queue.c,v 1.5 2011/08/31 16:24:57 plunky Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/queue.h>
|
||||
#include <bsd/sys/queue.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -16,5 +16,6 @@ config_opts += --enable-shared
|
|||
config_opts += --disable-werror
|
||||
config_opts += --enable-64-bit-bfd
|
||||
config_opts += --with-system-zlib
|
||||
config_opts += --disable-gprofng
|
||||
|
||||
include targets.mk
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
distname = groff
|
||||
distext = gz
|
||||
#patches += groff-musl-signbit.patch
|
||||
patches += groff-musl-signbit.patch
|
||||
makeflags = -j1
|
||||
groff = groff
|
||||
groff_path = $(shell dirname $$(which groff))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
||||
#
|
||||
distname = iproute2
|
||||
patches = iproute2-consolidated.patch
|
||||
patches += iproute2-consolidated.patch
|
||||
patches += iproute2-missing-min.patch
|
||||
no_objdir = 1
|
||||
include world.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur iproute2-5.19.0.orig/ip/ipstats.c iproute2-5.19.0/ip/ipstats.c
|
||||
--- iproute2-5.19.0.orig/ip/ipstats.c 2022-12-30 00:50:52.499470165 -0500
|
||||
+++ iproute2-5.19.0/ip/ipstats.c 2022-12-30 00:52:26.537035260 -0500
|
||||
@@ -6,6 +6,8 @@
|
||||
#include "utils.h"
|
||||
#include "ip_common.h"
|
||||
|
||||
+#define MIN(a,b) (((a)<(b))?(a):(b))
|
||||
+
|
||||
struct ipstats_stat_dump_filters {
|
||||
/* mask[0] filters outer attributes. Then individual nests have their
|
||||
* filtering mask at the index of the nested attribute.
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/cdefs.h>
|
||||
//#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ CFLAGS = -g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -
|
|||
CFLAGS += --sysroot=$(DESTDIR)
|
||||
#CFLAGS += --sysroot=$(DESTDIR) -I$(global_srcdir)/musl-fts-$(musl-fts_version)
|
||||
LDADD = -lz
|
||||
#LDADD = -lz -lfts
|
||||
LDADD = -lz -lfts
|
||||
LDFLAGS =
|
||||
STATIC = -static
|
||||
PREFIX = /usr
|
||||
|
|
|
|||
|
|
@ -8,3 +8,8 @@ pre_configure = cd $(srcdir) && ./bootstrap.sh
|
|||
config_opts += --host=$(tgt)
|
||||
config_opts += --with-sysroot=$(DESTDIR)
|
||||
include targets.mk
|
||||
|
||||
$(srcdir)/.dirstamp: | $(global_srcdir)
|
||||
|
||||
$(global_srcdir):
|
||||
install -d $@
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
# Makefile - hhl - /usr/src/world/musl-obstack
|
||||
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
||||
#
|
||||
distname = musl-obstack
|
||||
distext = gz
|
||||
include world.mk
|
||||
distext = gz
|
||||
include world.mk
|
||||
pre_configure = cd $(srcdir) && ./bootstrap.sh
|
||||
config_opts += --host=$(tgt)
|
||||
config_opts += --with-sysroot=$(DESTDIR)
|
||||
include targets.mk
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
||||
#
|
||||
distname = psmisc
|
||||
patches += psmisc-malloc.patch
|
||||
include world.mk
|
||||
config_opts += --host=$(tgt)
|
||||
export CFLAGS = --sysroot=$(DESTDIR)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue