File: makefile-for-debian.patch

package info (click to toggle)
jskeus 1.2.4%2Bdfsg-3
  • links: PTS, VCS
  • area: main
  • in suites: bookworm, bullseye, sid
  • size: 6,304 kB
  • sloc: ansic: 2,078; makefile: 399; cpp: 293; python: 69; sh: 31
file content (208 lines) | stat: -rw-r--r-- 7,542 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
Description: update makefile for debian
Makefile:
 .
 - debian requries all: for compile sources, simply (cd irteus; make)
 - set EUSDIR=/usr/share/euslisp
 - add install target
 .
irtues/Makefile:
 .
 - do not use Makefile.$(ARCHDIR)
 - set variables defined in Makefile.$(ARCHDIR)
 - set IRTEUSDIR / INSTALL{BIN,OBJ,LIB}DIR : to $(CURDIR)
 - do not compile LIBNR, use NROBJECTS
 - use eus2 instead of BINDIR/eus2
 - update install target
 .
 jskeus (1.2.1+dfsg-1) unstable; urgency=medium
 .
   * Initial release (Closes: #960845)
Author: Kei Okada <kei.okada@gmail.com>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: other
Reviewed-By: Kei Okada <kei.okada@gmail.com>
Last-Update: 2020-05-17

--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
-all: eus-installed irteus-installed manuals bashrc.eus
+all:
+	cd irteus; $(MAKE) MKDIR
+	cd irteus; $(MAKE)
 
 GIT_EUSURL ?= http://github.com/euslisp/EusLisp
 GIT_EUSBRANCH ?= master
@@ -47,7 +49,7 @@
  export MAKEFILE=Makefile.Darwin
 endif
 
-export EUSDIR=$(shell pwd)/eus
+export EUSDIR=/usr/share/euslisp
 
 manuals: manual.pdf jmanual.pdf
 manual.pdf:
@@ -79,6 +81,11 @@
 irteus-installed: eus-installed
 	cd irteus; $(MAKE)
 
+install:
+	if [ -e irteus ]; then cd irteus; make install ; fi
+	install -d $(DESTDIR)/usr/share/doc/jskeus-doc
+	install -t $(DESTDIR)/usr/share/doc/jskeus-doc doc/jmanual.pdf
+
 clean:
 	-rm -f bashrc.eus manual.pdf jmanual.pdf
 	if [ -e irteus ]; then cd irteus; make clean ; fi
--- a/irteus/Makefile
+++ b/irteus/Makefile
@@ -22,34 +22,49 @@
 ### ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ###
 
-include ./Makefile.$(ARCHDIR)
-
 # directory where this package install object file to
-IRTEUSDIR=$(EUSDIR)
+IRTEUSDIR=$(CURDIR)
 INSTALLBINDIR=$(IRTEUSDIR)/$(ARCHDIR)/bin
 INSTALLOBJDIR=$(IRTEUSDIR)/$(ARCHDIR)/obj
 INSTALLLIBDIR=$(IRTEUSDIR)/$(ARCHDIR)/lib
 
 # check bullet version
 BULLET_VER_MAJOR:=$(shell pkg-config bullet --modversion --silence-errors | cut -f1 -d.)
 BULLET_VER_MINOR:=$(shell pkg-config bullet --modversion --silence-errors | cut -f2 -d.)
 ifneq ($(and $(BULLET_VER_MAJOR),$(BULLET_VER_MINOR)),)
   BULLET_GE_2_83=$(shell [ $(BULLET_VER_MAJOR) -gt 2 -o \( $(BULLET_VER_MAJOR) -eq 2 -a $(BULLET_VER_MINOR) -ge 83 \) ] && echo true)
 endif
 ifeq ($(BULLET_GE_2_83), true)
     HAVE_BULLET=1
 else
     HAVE_BULLET=0
 endif
 $(info "--      HAVE_BULLET = ${HAVE_BULLET}")
 
 ifneq ($(wildcard PQP/*),)
     HAVE_PQP=1
 else
     HAVE_PQP=0
 endif
 $(info "--      HAVE_PQP = ${HAVE_PQP}")
 
+SVNVERSION=\"$(shell git rev-parse --short HEAD)\"
+LD=g++ -shared $(LDFLAGS)
+OBJOPT=-o
+OUTOPT=-o
+OSFX=o
+LSFX=so
+LPFX=lib
+ESFX=
+THREAD= -DTHREADED -DPTHREAD
+CFLAGS+=$(CPPFLAGS) -DLinux -D_REENTRANT -DGCC -I$(EUSDIR)/include $(THREAD) -DSVNVERSION=$(SVNVERSION) -fPIC
+CXXFLAGS+=$(CFLAGS) $(CPPFLAGS)
+CFLAGS+= -falign-functions=8
+CXXFLAGS+= -falign-functions=8
+SOFLAGS+= -rdynamic -fno-stack-protector -falign-functions=8 -Xlinker --unresolved-symbols=ignore-all
+EUSLIBDIR=/usr/lib/x86_64-linux-gnu/euslisp/
+IMPLIBIMG=-ljpeg -lpng
+
 # common
 WFLAGS= #-Wall
 
@@ -55,7 +71,7 @@
 LIBIRTEUSX=$(INSTALLLIBDIR)/$(LPFX)irteusx.$(LSFX)
 LIBIRTEUSIMG=$(INSTALLLIBDIR)/$(LPFX)irteusimg.$(LSFX)
 LIBIRTEUSGL=$(INSTALLLIBDIR)/$(LPFX)irteusgl.$(LSFX)
-LIBNR=$(INSTALLLIBDIR)/$(LPFX)nr.$(LSFX)
+LIBNR= #$(INSTALLLIBDIR)/$(LPFX)nr.$(LSFX)
 
 IRTEUS_OSFX=$(addsuffix .$(OSFX),$(IRTEUS))
 IRTEUS_LSFX=$(addsuffix .$(LSFX),$(IRTEUS))
@@ -107,6 +123,11 @@
 
 all: defun.h $(LIBNR) $(LIBIRTEUS) $(LIBIRTEUSG) $(LIBIRTEUSX) $(LIBIRTEUSIMG) $(LIBIRTEUSGL) make-link install-irtext.l
 
+MKDIR:
+	mkdir -p $(INSTALLBINDIR)
+	mkdir -p $(INSTALLOBJDIR)
+	mkdir -p $(INSTALLLIBDIR)
+
 .PHONY: defun.h
 defun.h:
 	echo '#include "eus.h"\n#undef defun\npointer TEST();\nvoid test(void) {register context *ctx; pointer mod; defun(ctx,"TEST",mod,TEST,NULL);}' > test.c
@@ -117,7 +138,7 @@
 
-$(LIBIRTEUS): $(IRTEUSOBJS) $(IRTCOBJECTS) $(LIBNR)
+$(LIBIRTEUS): $(IRTEUSOBJS) $(IRTCOBJECTS) $(LIBNR) $(NROBJECTS)
 	$(LD) $(SOFLAGS) $(OUTOPT)$(LIBIRTEUS) $(IRTEUSOBJS) \
-		$(IRTCOBJECTS) $(IMPLIB)
+		$(IRTCOBJECTS) $(IMPLIB) $(NROBJECTS)
 
 $(LIBIRTEUSG): $(IRTEUSGOBJS) $(IRTGCOBJECTS) $(LIBNR)
 	$(LD) $(SOFLAGS) $(OUTOPT)$(LIBIRTEUSG) $(IRTEUSGOBJS) \
@@ -134,27 +155,27 @@
 
 $(IRTEUSOBJS): $(INSTALLOBJDIR)/compile_irt.log
 $(IRTEUSOBJS) $(INSTALLOBJDIR)/compile_irt.log: $(IRTEUS_L)
-	$(BINDIR)/eus2$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irt.l > $(INSTALLOBJDIR)/compile_irt.log
+	eus2$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irt.l > $(INSTALLOBJDIR)/compile_irt.log
 	-rm -f $(IRTEUS_C) $(IRTEUS_H)
 
 $(IRTEUSGOBJS): $(INSTALLOBJDIR)/compile_irtg.log
 $(IRTEUSGOBJS) $(INSTALLOBJDIR)/compile_irtg.log: $(IRTEUSG_L)
-	$(BINDIR)/eusgl$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtg.l > $(INSTALLOBJDIR)/compile_irtg.log
+	eusgl$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtg.l > $(INSTALLOBJDIR)/compile_irtg.log
 	-rm -f $(IRTEUSG_C) $(IRTEUSG_H)
 
 $(IRTEUSXOBJS): $(INSTALLOBJDIR)/compile_irtx.log
 $(IRTEUSXOBJS) $(INSTALLOBJDIR)/compile_irtx.log: $(IRTEUSX_L)
-	$(BINDIR)/eusx$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtx.l > $(INSTALLOBJDIR)/compile_irtx.log
+	eusx$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtx.l > $(INSTALLOBJDIR)/compile_irtx.log
 	-rm -f $(IRTEUSX_C) $(IRTEUSX_H)
 
 $(IRTEUSIMGOBJS): $(INSTALLOBJDIR)/compile_irtimg.log
 $(IRTEUSIMGOBJS) $(INSTALLOBJDIR)/compile_irtimg.log: $(IRTEUSIMG_L)
-	$(BINDIR)/eusx$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtimg.l > $(INSTALLOBJDIR)/compile_irtimg.log
+	eusx$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtimg.l > $(INSTALLOBJDIR)/compile_irtimg.log
 	-rm -f $(IRTEUSIMG_C) $(IRTEUSIMG_H)
 
 $(IRTEUSGLOBJS): $(INSTALLOBJDIR)/compile_irtgl.log
 $(IRTEUSGLOBJS) $(INSTALLOBJDIR)/compile_irtgl.log: $(IRTEUSGL_L)
-	$(BINDIR)/eusgl$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtgl.l > $(INSTALLOBJDIR)/compile_irtgl.log
+	eusgl$(ESFX) "(setq *objdir* \"$(INSTALLOBJDIR)/\")" < ./compile_irtgl.l > $(INSTALLOBJDIR)/compile_irtgl.log
 	-rm -f $(IRTEUSGL_C) $(IRTEUSGL_H)
 
 PQP/$(ARCHDIR)/libPQP-static.a:
@@ -163,14 +184,24 @@
 $(LIBNR): $(NROBJECTS)
 	$(LD) $(SOFLAGS) $(OUTOPT)$(LIBNR) $(NROBJECTS)
 
-BINS=$(BINDIR)/irteus$(ESFX) $(BINDIR)/irteusgl$(ESFX)
+BINS=$(INSTALLBINDIR)/irteus$(ESFX) $(INSTALLBINDIR)/irteusgl$(ESFX)
 make-link: $(BINS) $(EUSDIR)/irteus
 $(BINS):
-	(cd $(INSTALLBINDIR); ln -sf eus$(ESFX) irteus$(ESFX))
-	(cd $(INSTALLBINDIR); ln -sf eusgl$(ESFX) irteusgl$(ESFX))
+	(cd $(INSTALLBINDIR); ln -sf /usr/bin/eus$(ESFX) irteus$(ESFX))
+	(cd $(INSTALLBINDIR); ln -sf /usr/bin/eusgl$(ESFX) irteusgl$(ESFX))
 $(EUSDIR)/irteus:
 	(cd $(IRTEUSDIR); ln -sf ../irteus irteus)
 
+install:
+	install -d $(DESTDIR)/usr/bin
+	ln -sf eus $(DESTDIR)/usr/bin/irteus
+	ln -sf eusgl $(DESTDIR)/usr/bin/irteusgl
+	install -d $(DESTDIR)/usr/lib
+	install -t $(DESTDIR)/usr/lib $(LIBIRTEUS) $(LIBIRTEUSG) $(LIBIRTEUSX) $(LIBIRTEUSIMG) $(LIBIRTEUSGL)
+	install -d $(DESTDIR)/usr/share/man/man1/
+	install -t $(DESTDIR)/usr/share/man/man1/ $(IRTEUSDIR)/../doc/irteus.1
+	ln -sf irteus.1 $(DESTDIR)/usr/share/man/man1/irteusgl.1
+
 install-irtext.l: $(IRTEUSDIR)/lib/irtext.l
 $(IRTEUSDIR)/lib/irtext.l: irtext.l
 	-cp -f irtext.l $(IRTEUSDIR)/lib