cpp-*-*-*: New target-specific packages

13 files changed, 32 insertions, 13 deletions

diff --git a/build b/build
index 239ff67..7b1a8d6 100755
--- a/build
+++ b/build
@@ -4,8 +4,8 @@ build:
 
 install:
 	mkdir -p dest/usr/bin
-	ln -sf cpp-4.7 dest/usr/bin/cpp
 	set -e; for target in $$(cat ../targets); do \
+		ln -sf "$${target}-cpp-4.7" "dest/usr/bin/$${target}-cpp"; \
 		ln -sf "$${target}-gcc-4.7" "dest/usr/bin/$${target}-gcc"; \
 		ln -sf "$${target}-g++-4.7" "dest/usr/bin/$${target}-g++"; \
 	done
diff --git a/changelog b/changelog
index 8656b12..f6ac8b8 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
 gcc-defaults (1.1) trunk
 
   * Update Maintainer.
+  * gcc-defaults-common: New binary package.
+  * Make target-specific cpp packages with slightly better descriptions.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Thu, 30 May 2019 17:10:49 -0400
 
diff --git a/config b/config
index e4ce14d..9ed2533 100755
--- a/config
+++ b/config
@@ -2,7 +2,7 @@
 
 set -e
 
-TPL_PKGS='gcc g++'
+TPL_PKGS='cpp gcc g++'
 
 main()
 {
diff --git a/cpp.pkg.in/control b/cpp.pkg.in/control
new file mode 100644
index 0000000..a835d86
--- /dev/null
+++ b/cpp.pkg.in/control
@@ -0,0 +1,7 @@
+Architecture: all
+Platform: all
+Depends: gcc-defaults-common (= ${Binary-Version}), cpp-4.7-@PKG_TARGET_ARCH@
+Description: GNU C preprocessor for @PKG_TARGET_ARCH@
+ The C preprocessor implements the macro language used to transform C, C++, and
+ Objective-C programs before they are compiled.  It can also be useful on its
+ own.
diff --git a/cpp.pkg.in/files b/cpp.pkg.in/files
new file mode 100644
index 0000000..0fd7e3c
--- /dev/null
+++ b/cpp.pkg.in/files
@@ -0,0 +1 @@
+/usr/bin/@PKG_TARGET_ARCH@-cpp
diff --git a/cpp.pkg.in/postinst b/cpp.pkg.in/postinst
new file mode 100755
index 0000000..6087128
--- /dev/null
+++ b/cpp.pkg.in/postinst
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+if [ "x${1}" = 'xconfigure' ]; then
+	if [ "x$(cat /etc/proteanos_arch)" = 'x@PKG_TARGET_ARCH@' ]; then
+		ln -sf @PKG_TARGET_ARCH@-cpp /usr/bin/cpp
+	fi
+fi
diff --git a/cpp.pkg.in/prerm b/cpp.pkg.in/prerm
new file mode 100755
index 0000000..6af1b97
--- /dev/null
+++ b/cpp.pkg.in/prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+if [ "${1}" = remove ]; then
+	if [ "x$(cat /etc/proteanos_arch)" = 'x@PKG_TARGET_ARCH@' ]; then
+		rm -f /usr/bin/cpp
+	fi
+fi
diff --git a/cpp.pkg/control b/cpp.pkg/control
deleted file mode 100644
index f8fb8f8..0000000
--- a/cpp.pkg/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Architecture: all
-Platform: all
-Depends: cpp-4.7
-Description: GNU C preprocessor
- The GNU C preprocessor is a macro processor that is used automatically
- by the GNU C compiler to transform programs before actual compilation.
- .
- This package depends on the default version of the GNU C preprocessor.
diff --git a/cpp.pkg/files b/cpp.pkg/files
deleted file mode 100644
index 532e3c7..0000000
--- a/cpp.pkg/files
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/cpp
diff --git a/g++.pkg.in/control b/g++.pkg.in/control
index 601fd03..54c728f 100644
--- a/g++.pkg.in/control
+++ b/g++.pkg.in/control
@@ -1,6 +1,6 @@
 Architecture: all
 Platform: all
-Depends: cpp (= ${Binary-Version}), gcc-@PKG_TARGET_ARCH@ (= ${Binary-Version}),
+Depends: gcc-defaults-common (= ${Binary-Version}), gcc-@PKG_TARGET_ARCH@ (= ${Binary-Version}),
  g++-4.7-@PKG_TARGET_ARCH@
 Description: GNU C++ compiler for @PKG_TARGET_ARCH@
  This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
diff --git a/gcc-defaults-common.pkg/control b/gcc-defaults-common.pkg/control
new file mode 100644
index 0000000..fa97d28
--- /dev/null
+++ b/gcc-defaults-common.pkg/control
@@ -0,0 +1,4 @@
+Architecture: all
+Platform: all
+Description: GNU compiler collection defaults - common files
+ This package provides documentation for the gcc-defaults source package.
diff --git a/cpp.pkg/docs b/gcc-defaults-common.pkg/docs
index e69de29..e69de29 100644
--- a/cpp.pkg/docs
+++ b/gcc-defaults-common.pkg/docs
diff --git a/gcc.pkg.in/control b/gcc.pkg.in/control
index e1986bc..9565da9 100644
--- a/gcc.pkg.in/control
+++ b/gcc.pkg.in/control
@@ -1,6 +1,6 @@
 Architecture: all
 Platform: all
-Depends: cpp (= ${Binary-Version}), gcc-4.7-@PKG_TARGET_ARCH@
+Depends: gcc-defaults-common (= ${Binary-Version}), gcc-4.7-@PKG_TARGET_ARCH@
 Description: GNU C compiler for @PKG_TARGET_ARCH@
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
  .