Towards 3.0 (quilt): we can apply patches

1 files changed, 69 insertions, 29 deletions

diff --git a/libc/debian/rules b/libc/debian/rules
index 0ac1acd..ec9676f 100755
--- a/libc/debian/rules
+++ b/libc/debian/rules
@@ -10,20 +10,12 @@ CC = gcc
 # only for testing:
 #make = -m '/home/sunmake/make -j2 --sun'
 
-# libs having "install_h" target to install headers first:
-libs_headers := \
-libc \
-libmd \
-libsocket \
-libnsl \
-libgen \
-
 # Actually, order is important:
-libs_core := \
+libs := \
 common \
 libavl \
 libc \
-libutil \
+libc_db \
 libgen \
 libcrypt \
 libmd \
@@ -36,14 +28,6 @@ libsecdb \
 libsocket \
 crypt_modules \
 
-libs_filters := \
-libintl \
-libpthread \
-libxnet \
-librt \
-
-libs := $(libs_core) $(libs_filters)
-
 # usr/src/lib/nsswitch/* :
 nsswitch := \
 files \
@@ -54,25 +38,22 @@ compat \
 
 # usr/src/cmd/sgs/* :
 sgs := \
+crle \
+include \
+ld \
+ldd \
+lddstub \
 libconv \
 libdl \
-liblddbg \
 libelf \
 libld \
+liblddbg \
 librtld \
+librtld_db \
 rtld \
-lddstub \
-crle
 
-# Debugging libraries, going into libc-db package
-# (headers proc_service.h, rtld_db.h, and thread_db.h)
-sgs += librtld_db
-libs += libc_db
 
 # usr/src/cmd/* for libc functionality:
-#
-# NOTES:
-# 1. tzselect is under zic
 cmd := \
 utmp_update \
 utmpd \
@@ -86,13 +67,72 @@ rpcgen \
 getent \
 gencat \
 
+man1 := $(filter-out utmp_update,$(cmd))
+man1 += $(filter-out lib% include lddstub rtld, $(sgs))
+
+# usr/src/common:
+common := \
+avl \
+unicode \
+util \
+
+BUILD = build-tree
+ROOT = $(BUILD)/root
+
+ILLUMOS_GATE = illumos-gate
+
+$(ILLUMOS_GATE):
+	dh_illumos_gate --checkout --destdir=$(ILLUMOS_GATE)
+
+.PHONY: create-orig
+create-orig: $(ILLUMOS_GATE)
+	dh_illumos_gate --create-orig --build \
+		$(ILLUMOS_GATE)/usr/src/head \
+		$(ILLUMOS_GATE)/usr/src/man/man2/\*.2 \
+		$(ILLUMOS_GATE)/usr/src/man/man3/\*.3 \
+		$(ILLUMOS_GATE)/usr/src/man/man3c/\*.3c \
+		$(cmd:%=$(ILLUMOS_GATE)/usr/src/cmd/%) \
+		$(common:%=$(ILLUMOS_GATE)/usr/src/common/%) \
+		$(libs:%=$(ILLUMOS_GATE)/usr/src/lib/%) \
+		$(man1:%=$(ILLUMOS_GATE)/usr/src/man/man1\*/%.\*) \
+		$(nsswitch:%=$(ILLUMOS_GATE)/usr/src/lib/nsswitch/%) \
+		$(sgs:%=$(ILLUMOS_GATE)/usr/src/cmd/sgs/%) \
+
+test-orig: create-orig
+	./debian/rules clean
+	rm -rf usr .pc
+	tar xf ../libc_4.3.1.git.35107df.orig.tar.xz --strip=1
+	quilt push -a
+	: ./debian/rules build
+
 
 # We must have this libraries so packages can be compiled,
 # but if we just use filters provided by illumos gate, it causes
 # some rare FTBFS with GNU ld. We can't use symlink (e. g. libpthread -> libc),
 # because in this case libc can go before libgcc_s, and some other packages
 # will crash in runtime. So we make a dummy library.
-FAKE_LIBS = $(subst lib,,$(libs_filters) libdl libaio libsendfile libthread libposix4 libdoor)
+
+libs_filters := \
+libaio \
+libdl \
+libdoor \
+libintl \
+libposix4 \
+libpthread \
+librt \
+libsendfile \
+libthread \
+libxnet \
+
+FAKE_LIBS = $(subst lib,,$(libs_filters))
+
+# libs having "install_h" target to install headers first:
+libs_headers := \
+libc \
+libmd \
+libsocket \
+libnsl \
+libgen \
 
 unpack: unpack-stamp
 unpack-stamp: