Browse Source

Attempt to link to glibc 2.23 for plugins.

tags/v1.0.0
Andrew Belt 5 years ago
parent
commit
babcc49a2a
5 changed files with 3760 additions and 8 deletions
  1. +25
    -0
      LICENSE-dist.txt
  2. +2
    -3
      Makefile
  3. +4
    -5
      compile.mk
  4. +3727
    -0
      include/force_link_glibc_2.23.h
  5. +2
    -0
      plugin.mk

+ 25
- 0
LICENSE-dist.txt View File

@@ -512,3 +512,28 @@ EXEMPLARY, OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
SOFTWARE.


# glibc_version_header

MIT License

Copyright (c) 2018 Tom Mason

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

+ 2
- 3
Makefile View File

@@ -1,9 +1,8 @@
RACK_DIR ?= .
VERSION = 1.dev.$(shell git rev-parse --short HEAD)
VERSION := 1.dev.$(shell git rev-parse --short HEAD)

FLAGS += -DVERSION=$(VERSION)
FLAGS += -Iinclude
FLAGS += -Idep/include -Idep/lib/libzip/include
FLAGS += -Iinclude -Idep/include

include arch.mk



+ 4
- 5
compile.mk View File

@@ -15,15 +15,13 @@ FLAGS += -g
FLAGS += -O3 -march=nocona -funsafe-math-optimizations
# Warnings
FLAGS += -Wall -Wextra -Wno-unused-parameter

ifneq ($(ARCH), mac)
CXXFLAGS += -Wsuggest-override
endif
# C++ standard
CXXFLAGS += -std=c++11

# Architecture-independent flags
ifdef ARCH_LIN
FLAGS += -DARCH_LIN
CXXFLAGS += -Wsuggest-override
endif
ifdef ARCH_MAC
FLAGS += -DARCH_MAC
@@ -36,6 +34,7 @@ endif
ifdef ARCH_WIN
FLAGS += -DARCH_WIN
FLAGS += -D_USE_MATH_DEFINES
CXXFLAGS += -Wsuggest-override
endif

CFLAGS += $(FLAGS)


+ 3727
- 0
include/force_link_glibc_2.23.h
File diff suppressed because it is too large
View File


+ 2
- 0
plugin.mk View File

@@ -23,6 +23,8 @@ ifdef ARCH_LIN
LDFLAGS += -shared
TARGET := plugin.so
RACK_USER_DIR ?= $(HOME)/.Rack
# Link to glibc 2.23
FLAGS += -include $(RACK_DIR)/include/force_link_glibc_2.23.h
endif

ifdef ARCH_MAC


Loading…
Cancel
Save