[Gsrc-commit] /srv/bzr/gsrc/trunk r1239: clean up superopt and fix install

[Brandon Invergo]

------------------------------------------------------------
revno: 1239
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-21 13:40:59 +0100
message:
  clean up superopt and fix install
added:
  gnu/superopt/config.mk
  gnu/superopt/files/
  gnu/superopt/files/superopt-2.5-fix-install.diff
modified:
  gnu/superopt/Makefile
  gnu/superopt/sha256sums

=== modified file 'gnu/superopt/Makefile'
--- a/gnu/superopt/Makefile     2012-08-30 21:44:35 +0000
+++ b/gnu/superopt/Makefile     2012-11-21 12:40:59 +0000
@@ -1,25 +1,24 @@
 GARNAME = superopt
 GARVERSION = 2.5
+HOME_URL = http://www.gnu.org/software/superopt
+DESCRIPTION = A function sequence generator for superoptimization
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = superopt/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
-#SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-CONFIGURE_SCRIPTS = custom
+SIGFILES =
+PATCHFILES = $(DISTNAME)-fix-install.diff
 BUILD_SCRIPTS = $(WORKSRC)/Makefile
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
-BUILD_ARGS += CPU=-Di386 superopt
+BUILDDEPS = 
+LIBDEPS = 
 
-HOME_URL = http://www.gnu.org/software/superopt
-DESCRIPTION = A function sequence generator for superoptimization
+######################################################################
 
 include ../../gar.mk
-
-configure-custom:
-       $(MAKECOOKIE)
+include config.mk
+
+

=== added file 'gnu/superopt/config.mk'
--- a/gnu/superopt/config.mk    1970-01-01 00:00:00 +0000
+++ b/gnu/superopt/config.mk    2012-11-21 12:40:59 +0000
@@ -0,0 +1,4 @@
+## Configuration options for superopt ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?= CPU=-DI386 superopt

=== added directory 'gnu/superopt/files'
=== added file 'gnu/superopt/files/superopt-2.5-fix-install.diff'
--- a/gnu/superopt/files/superopt-2.5-fix-install.diff  1970-01-01 00:00:00 
+0000
+++ b/gnu/superopt/files/superopt-2.5-fix-install.diff  2012-11-21 12:40:59 
+0000
@@ -0,0 +1,40 @@
+diff -x config.log -x config.status -ru tmp@/superopt-2.5/Makefile 
work/superopt-2.5/Makefile
+--- tmp/superopt-2.5/Makefile  1995-05-23 08:20:27.000000000 +0200
++++ work/superopt-2.5/Makefile 2012-11-21 13:40:04.175934279 +0100
+@@ -1,5 +1,6 @@
+ # Makefile for GNU superoptimizer
+ 
++DESTDIR =
+ MAXCOST = 3
+ EXTRA = -shifts -extracts
+ 
+@@ -25,7 +26,7 @@
+ OBJS  = superopt.o
+ SRCS  = superopt.c
+ HDRS  = run_program.def insn.def goal.def superopt.h version.h longlong.h
+-BINDIR        = /usr/local/bin
++BINDIR        = ${prefix}/bin
+ INSTALL       = install -c
+ FILES = README COPYING Makefile TODO ChangeLog superopt.c synth.def $(HDRS)
+ 
+@@ -37,13 +38,16 @@
+ clean:
+       rm -f $(OBJS) superopt $(ALL_MACHINES) *.tmp
+ 
+-install: superopt
+-      $(INSTALL) superopt $(BINDIR)/superopt
++install-dirs:
++      $(INSTALL) -d $(DESTDIR)$(BINDIR)
++
++install: superopt install-dirs
++      $(INSTALL) superopt $(DESTDIR)$(BINDIR)/superopt
+ 
+ all: $(ALL_MACHINES)
+ 
+-install-all: all
+-      for x in $(ALL_MACHINES); do $(INSTALL) $$x $(BINDIR)/$$x; done
++install-all: all install-dirs
++      for x in $(ALL_MACHINES); do $(INSTALL) $$x $(DESTDIR)$(BINDIR)/$$x; 
done
+ 
+ run-all: sparc.res power.res powerpc.res m88000.res am29k.res mc68000.res \
+       mc68020.res i386.res i960a.res i960b.res pyr.res alpha.res sh.res \

=== modified file 'gnu/superopt/sha256sums'
--- a/gnu/superopt/sha256sums   2012-08-30 21:44:35 +0000
+++ b/gnu/superopt/sha256sums   2012-11-21 12:40:59 +0000
@@ -1,1 +1,2 @@
 4e28eb00a835730b8f33487c78094a6ced2c4e7cbcd37937ac6081b9b59925d7  
download/superopt-2.5.tar.gz
+23635e4ef3b4192642000e95f9d50fa311d248b0379b721b95fc136c3e5a781c  
download/superopt-2.5-fix-install.diff