From 3563e7e1aaa8489c4445b672158128e1e8a184ae Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sun, 2 Aug 2020 13:52:21 -0500
Subject: [PATCH] Add -fPIC to default cflags when building boot image.

---
 CHANGELOG.md         | 6 ++++++
 Makefile             | 4 ++--
 build_win.bat        | 2 --
 meson.build          | 2 +-
 src/conf/janetconf.h | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed5c83d3..37b227c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.11.2 - 2020-08-03
+- Add `index-of` to core library.
+- Add `-fPIC` back to core CFLAGS (non-optional when compiling default client  with Makefile)
+- Fix defaults on Windows for ARM
+- Fix defaults on NetBSD.
+
 ## 1.11.1 - 2020-07-25
 - Fix jpm and git with multiple git installs on Windows
 - Fix importing a .so file in the current directory
diff --git a/Makefile b/Makefile
index 4432ef97..189af399 100644
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,10 @@ SONAME_SETTER=-Wl,-soname,
 # For cross compilation
 HOSTCC?=$(CC)
 HOSTAR?=$(AR)
-CFLAGS?=-fPIC -O2
+CFLAGS?=-O2
 LDFLAGS?=-rdynamic
 
-COMMON_CFLAGS:=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fvisibility=hidden
+COMMON_CFLAGS:=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fvisibility=hidden -fPIC
 BOOT_CFLAGS:=-DJANET_BOOTSTRAP -DJANET_BUILD=$(JANET_BUILD) -O0 -g $(COMMON_CFLAGS)
 BUILD_CFLAGS:=$(CFLAGS) $(COMMON_CFLAGS)
 
diff --git a/build_win.bat b/build_win.bat
index abb5ee2e..0e002019 100644
--- a/build_win.bat
+++ b/build_win.bat
@@ -168,8 +168,6 @@ call jpm --verbose --test --modpath=. install https://github.com/janet-lang/path
 @if errorlevel 1 goto :TESTINSTALLFAIL
 call jpm --verbose --test --modpath=. install https://github.com/janet-lang/argparse.git
 @if errorlevel 1 goto :TESTINSTALLFAIL
-call jpm --verbose --modpath=. install https://github.com/bakpakin/x43bot.git
-@if errorlevel 1 goto :TESTINSTALLFAIL
 popd
 exit /b 0
 
diff --git a/meson.build b/meson.build
index 78276551..f7667cad 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@
 
 project('janet', 'c',
   default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'],
-  version : '1.11.1')
+  version : '1.11.2')
 
 # Global settings
 janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')
diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h
index 9d22b384..9a47662c 100644
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -28,9 +28,9 @@
 
 #define JANET_VERSION_MAJOR 1
 #define JANET_VERSION_MINOR 11
-#define JANET_VERSION_PATCH 1
+#define JANET_VERSION_PATCH 2
 #define JANET_VERSION_EXTRA ""
-#define JANET_VERSION "1.11.1"
+#define JANET_VERSION "1.11.2"
 
 /* #define JANET_BUILD "local" */