Skip to content

Commit 68b626f

Browse files
committed
build release script: add downloads for djgpp sockets and pthreads, patch for pthread.h
1 parent faefeab commit 68b626f

File tree

2 files changed

+37
-9
lines changed

2 files changed

+37
-9
lines changed

contrib/release/build.sh

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ dos)
251251

252252
djver=205
253253
gccver=710
254-
djgppgccversiondir=7.1.0
254+
djgppgccversiondir=7
255255
bnuver=229
256256
gdbver=771
257257
djpkg=current
@@ -268,23 +268,31 @@ dos)
268268
download_djgpp ${djpkg}/v2gnu/ fil41br2
269269
download_djgpp ${djpkg}/v2gnu/ mak421b
270270
download_djgpp ${djpkg}/v2gnu/ shl2011br2
271+
download_djgpp ${djpkg}/v2gnu/ pth207b
272+
273+
download_djgpp ${djpkg}/v2tk/ ls080b
271274

272275
# Sources for stuff that goes into the FB-dos package (needs updating to new versions)
273276
download_djgpp ${djpkg}/v2gnu/ bnu${bnuver}s
274277
download_djgpp ${djpkg}/v2gnu/ gcc${gccver}s
275278
download_djgpp ${djpkg}/v2gnu/ gdb${gdbver}s
276279
download_djgpp ${djpkg}/v2/ djlsr${djver}
277280

278-
unzip -q ../input/DJGPP/djdev${djver}.zip
281+
unzip -qo ../input/DJGPP/djdev${djver}.zip
282+
283+
unzip -qo ../input/DJGPP/shl2011br2.zip
284+
unzip -qo ../input/DJGPP/fil41br2.zip
285+
unzip -qo ../input/DJGPP/mak421b.zip
286+
unzip -qo ../input/DJGPP/pth207b.zip
287+
288+
unzip -qo ../input/DJGPP/ls080b.zip
279289

280-
unzip -q ../input/DJGPP/shl2011br2.zip
281-
unzip -q ../input/DJGPP/fil41br2.zip
282-
unzip -q ../input/DJGPP/mak421b.zip
290+
unzip -qo ../input/DJGPP/gdb${gdbver}b.zip
291+
unzip -qo ../input/DJGPP/bnu${bnuver}b.zip
292+
unzip -qo ../input/DJGPP/gcc${gccver}b.zip
293+
unzip -qo ../input/DJGPP/gpp${gccver}b.zip
283294

284-
unzip -q ../input/DJGPP/gdb${gdbver}b.zip
285-
unzip -q ../input/DJGPP/bnu${bnuver}b.zip
286-
unzip -q ../input/DJGPP/gcc${gccver}b.zip
287-
unzip -q ../input/DJGPP/gpp${gccver}b.zip
295+
patch -p0 < ../djgpp-fix-pthread.patch
288296
;;
289297
win32)
290298
get_mingww64_toolchain 32 i686
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- pthread.h.orig 2007-04-13 15:37:00.000000000 -0400
2+
+++ pthread.h 2019-01-03 15:54:18.000000000 -0500
3+
@@ -110,11 +110,17 @@
4+
*/
5+
#include <sys/types.h> /* for ssize_t */
6+
#include <sys/time.h> /* for struct timeval */
7+
+#if 0
8+
#include <sys/socket.h> /* for sockaddr */
9+
+#endif
10+
#include <signal.h> /* for sigset_t */
11+
+#if 0
12+
#include <sys/wtime.h> /* for struct timespec */
13+
+#endif
14+
#include <unistd.h> /* for off_t */
15+
+#if 0
16+
#include <sys/select.h>
17+
+#endif
18+
19+
/*
20+
* Unprotect namespace, so we can define our own variants now

0 commit comments

Comments
 (0)