Revision: 24788
http://sourceforge.net/p/gar/code/24788
Author: wahwah
Date: 2015-03-29 13:04:33 +0000 (Sun, 29 Mar 2015)
Log Message:
-----------
arc/trunk: It builds, but packaging still needs to be done.
Modified Paths:
--------------
csw/mgar/pkg/arc/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-to-accept-common-env-variables.patch
Removed Paths:
-------------
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-settings-for-Solaris.patch
Modified: csw/mgar/pkg/arc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/arc/trunk/Makefile 2015-03-27 21:34:42 UTC (rev 24787)
+++ csw/mgar/pkg/arc/trunk/Makefile 2015-03-29 13:04:33 UTC (rev 24788)
@@ -18,13 +18,17 @@
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = custom
+TEST_TARGET =
-PATCHFILES += 0001-Adjust-Makefile-settings-for-Solaris.patch
+PATCHFILES = 0001-Adjust-Makefile-to-accept-common-env-variables.patch
-# EXTRA_CFLAGS = -DSYSV=1 -DNEED_ALPHASORT
-# EXTRA_INC = /usr/ucbinclude
-# EXTRA_LIB = -L/usr/ucb -lucb
+GARCOMPILER = GNU
+EXTRA_CFLAGS = -DSYSV=1 -DNEED_ALPHASORT
+EXTRA_INC = /usr/ucbinclude
+EXTRA_LIB = /usr/ucblib
+EXTRA_LINKER_FLAGS = -lucb
+
include gar/category.mk
build-custom:
Deleted:
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-settings-for-Solaris.patch
===================================================================
---
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-settings-for-Solaris.patch
2015-03-27 21:34:42 UTC (rev 24787)
+++
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-settings-for-Solaris.patch
2015-03-29 13:04:33 UTC (rev 24788)
@@ -1,48 +0,0 @@
-From 0477e562ed5d6f77e02de98202ac822708eb7a4b Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <mac...@opencsw.org>
-Date: Sun, 1 Jun 2014 11:40:16 +0200
-Subject: [PATCH] Adjust Makefile settings for Solaris
-
----
- Makefile | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c6273d0..4a73a01 100644
---- a/Makefile
-+++ b/Makefile
-@@ -39,12 +39,12 @@ PROG =
- # (See the Sysvarcstuf shar file)
- #SYSTEM = -DGEMDOS=1 -fstrength-reduce -fomit-frame-pointer
-finline-functions -fdefer-pop -mpcrel
- #SYSTEM = -DBSD=1
--SYSTEM = -DSYSV=1
-+SYSTEM = -DSYSV=1 -DNEED_ALPHASORT
-
--OPT = -O -Wall
-+OPT = $(OPTFLAGS)
- # For MWC 3.0 on the Atari ST, use:
- #CFLAGS = -VCOMPAC -VPEEP
--CFLAGS = $(OPT) $(SYSTEM)
-+CFLAGS = $(OPT) $(SYSTEM) $(CPPFLAGS)
-
- # GNU's gcc is very nice, if you've got it. Otherwise just cc.
- #CC = cgcc -mshort -mbaserel
-@@ -58,7 +58,7 @@ TMCLOCK = tmclock.o
-
- # Files needed for System V
- #SYSVOBJ = getwd.o rename.o scandir.o utimes.o
--SYSVOBJ =
-+SYSVOBJ = scandir.o
-
- OBJS = arc.o arcadd.o arccode.o arccvt.o arcdata.o arcdel.o arcdos.o \
- arcext.o arcio.o arclst.o arclzw.o arcmatch.o arcpack.o arcrun.o \
-@@ -137,4 +137,4 @@ install: all
- install -s -m 0755 -D marc $(DESTDIR)$(PREFIX)/bin/marc
- install -m 0644 -D arc.1 $(DESTDIR)$(PREFIX)/share/man/man1/arc.1
- install -m 0644 -D marc.1 $(DESTDIR)$(PREFIX)/share/man/man1/marc.1
--
-\ No newline at end of file
-+
---
-1.7.10.3
-
Added:
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-to-accept-common-env-variables.patch
===================================================================
---
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-to-accept-common-env-variables.patch
(rev 0)
+++
csw/mgar/pkg/arc/trunk/files/0001-Adjust-Makefile-to-accept-common-env-variables.patch
2015-03-29 13:04:33 UTC (rev 24788)
@@ -0,0 +1,66 @@
+From 02347aaa76607a4747c74525262bc59a4fd4cbdf Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <mac...@opencsw.org>
+Date: Sun, 29 Mar 2015 00:39:06 +0100
+Subject: [PATCH] Adjust Makefile to accept common env variables
+
+---
+ Makefile | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c6273d0..505bff7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,7 +5,7 @@
+ # This Makefile supports Atari ST and all Unix versions.
+
+ # The installation prefix
+-PREFIX = /usr/local
++PREFIX = $(prefix)
+
+ # This version is needed for the dist target
+ VERSION = 5.21p
+@@ -39,16 +39,16 @@ PROG =
+ # (See the Sysvarcstuf shar file)
+ #SYSTEM = -DGEMDOS=1 -fstrength-reduce -fomit-frame-pointer
-finline-functions -fdefer-pop -mpcrel
+ #SYSTEM = -DBSD=1
+-SYSTEM = -DSYSV=1
++# SYSTEM = -DSYSV=1 -DNEED_ALPHASORT
+
+-OPT = -O -Wall
++OPT = $(OPTFLAGS)
+ # For MWC 3.0 on the Atari ST, use:
+ #CFLAGS = -VCOMPAC -VPEEP
+-CFLAGS = $(OPT) $(SYSTEM)
++#CFLAGS = $(OPT) $(SYSTEM) $(CPPFLAGS)
+
+ # GNU's gcc is very nice, if you've got it. Otherwise just cc.
+ #CC = cgcc -mshort -mbaserel
+-CC = cc
++CC = gcc
+
+ # tmclock is only needed on Unix systems...
+ TMCLOCK = tmclock.o
+@@ -69,10 +69,10 @@ MOBJ = marc.o arcdata.o arcdos.o arcio.o arcmatch.o
arcmisc.o $(SYSVOBJ)
+ all: arc$(PROG) marc$(PROG)
+
+ arc$(PROG): $(OBJS) $(TMCLOCK)
+- $(CC) $(OPT) -o arc$(PROG) $(OBJS) $(TMCLOCK) $(LIBS)
++ $(CC) $(OPT) -o arc$(PROG) $(OBJS) $(TMCLOCK) $(LIBS) $(LDFLAGS)
+
+ marc$(PROG): $(MOBJ) $(TMCLOCK)
+- $(CC) $(OPT) -o marc$(PROG) $(MOBJ) $(TMCLOCK) $(LIBS)
++ $(CC) $(OPT) -o marc$(PROG) $(MOBJ) $(TMCLOCK) $(LIBS) $(LDFLAGS)
+
+ clean:
+ rm -f *.o arc$(PROG) marc$(PROG)
+@@ -137,4 +137,4 @@ install: all
+ install -s -m 0755 -D marc $(DESTDIR)$(PREFIX)/bin/marc
+ install -m 0644 -D arc.1 $(DESTDIR)$(PREFIX)/share/man/man1/arc.1
+ install -m 0644 -D marc.1 $(DESTDIR)$(PREFIX)/share/man/man1/marc.1
+-
+\ No newline at end of file
++
+--
+2.3.3
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
