pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

obnc: fix a few soft build failures from the ./install script



Module Name:	pkgsrc-wip
Committed By:	Dean Matzkov <bapabooiee%gmail.com@localhost>
Pushed By:	bapa
Date:		Fri Jan 25 01:08:40 2019 -0700
Changeset:	f2113019fc4895878d821f9e56180c04db643105

Modified Files:
	obnc/Makefile
	obnc/PLIST
	obnc/TODO

Log Message:
obnc: fix a few soft build failures from the ./install script

Compiling stuff in the do-install phase definitely isn't the proper
thing to do, but at least we're getting more stuff to build successfully.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f2113019fc4895878d821f9e56180c04db643105

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 obnc/Makefile |  1 +
 obnc/PLIST    | 25 +++++++++++++++++++++++++
 obnc/TODO     |  9 +++------
 3 files changed, 29 insertions(+), 6 deletions(-)

diffs:
diff --git a/obnc/Makefile b/obnc/Makefile
index 480dbb73e8..a44913fec8 100644
--- a/obnc/Makefile
+++ b/obnc/Makefile
@@ -22,6 +22,7 @@ do-build:
 
 do-install:
 	cd ${WRKSRC} && \
+		${PKGSRC_SETENV} ${MAKE_ENV} \
 		./install \
 			--destdir=${DESTDIR}
 
diff --git a/obnc/PLIST b/obnc/PLIST
index 1f5546909f..cda14f49da 100644
--- a/obnc/PLIST
+++ b/obnc/PLIST
@@ -6,10 +6,35 @@ bin/obncdoc
 bin/obncdoc-extract
 bin/obncdoc-index
 bin/obncdoc-markup
+include/obnc/Files.h
+include/obnc/In.h
+include/obnc/Input0.h
+include/obnc/Math.h
 include/obnc/OBNC.h
 include/obnc/OBNCConfig.h
+include/obnc/Out.h
+include/obnc/Strings.h
+lib/obnc/Files.imp
+lib/obnc/Files.o
+lib/obnc/Files.sym
+lib/obnc/In.imp
+lib/obnc/In.o
+lib/obnc/In.sym
+lib/obnc/Input0.imp
+lib/obnc/Input0.o
+lib/obnc/Input0.sym
+lib/obnc/Math.env
+lib/obnc/Math.imp
+lib/obnc/Math.o
+lib/obnc/Math.sym
 lib/obnc/OBNC.env
 lib/obnc/OBNC.o
+lib/obnc/Out.imp
+lib/obnc/Out.o
+lib/obnc/Out.sym
+lib/obnc/Strings.imp
+lib/obnc/Strings.o
+lib/obnc/Strings.sym
 man/man1/obnc-compile.1
 man/man1/obnc-path.1
 man/man1/obnc.1
diff --git a/obnc/TODO b/obnc/TODO
index 44481f611e..345c382a8c 100644
--- a/obnc/TODO
+++ b/obnc/TODO
@@ -1,12 +1,9 @@
-- ./install tries to build extra stuff, and is rigged to ignore those
+- ./install tries to build extra stuff, and is rigged to ignore any
   errors and keep going, as those components are considered optional.
 
   We might want to consider patching that out and cause a hard-failure
-  if errors are detected, since things randomly not getting built/installed
-  might not play nice with PLIST.
-
-- PLIST currently doesn't include everything, due to the soft build failures
-  noted above. It may also be responsible for obnc-libstd failing to build too.
+  if errors are detected, and/or move building them into ./install, as things
+  randomly not getting built/installed might not play nice with PLIST.
 
 - Something built by ./install wants libSDL, so we'll want to use the Options
   framework to selectively-enable using it (which'll probably require patching


Home | Main Index | Thread Index | Old Index