Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support successfully bootstrapping on Solaris (OpenIndiana). #1069

Merged
merged 1 commit into from
Apr 26, 2018
Merged

Support successfully bootstrapping on Solaris (OpenIndiana). #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Bootstrap.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,16 @@ bsd: $(SRC)
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)

solaris: $(SRC)
$(SILENT) rm -rf ./bin
$(SILENT) rm -rf ./build
$(SILENT) rm -rf ./obj
mkdir -p build/bootstrap
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm
./build/bootstrap/premake_bootstrap embed
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)

windows-base: $(SRC)
$(SILENT) if exist .\bin rmdir /s /q .\bin
$(SILENT) if exist .\build rmdir /s /q .\build
Expand Down
5 changes: 5 additions & 0 deletions contrib/curl/lib/curl_setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@
# include "config-linux.h"
#endif

#if defined(__sun__) && defined(__svr4__)
# include "config-linux.h"
# undef HAVE_IOCTL_SIOCGIFADDR
#endif

#ifdef __APPLE__ && __MACH__
# include "config-osx.h"
#endif
Expand Down
3 changes: 2 additions & 1 deletion contrib/curl/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ project "curl-lib"
filter { "system:not windows", "system:not macosx" }
defines { "USE_MBEDTLS" }

filter { "system:linux or bsd" }
filter { "system:linux or bsd or solaris" }
defines { "CURL_HIDDEN_SYMBOLS" }

-- find the location of the ca bundle
Expand All @@ -37,6 +37,7 @@ project "curl-lib"
"/usr/share/ssl/certs/ca-bundle.crt",
"/usr/local/share/certs/ca-root.crt",
"/usr/local/share/certs/ca-root-nss.crt",
"/etc/certs/ca-certificates.crt",
"/etc/ssl/cert.pem" } do
if os.isfile(f) then
ca = f
Expand Down
2 changes: 1 addition & 1 deletion contrib/libzip/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ project "zip-lib"
"**.c"
}

filter "system:linux or bsd"
filter "system:linux or bsd or solaris"
defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" }

filter "system:windows"
Expand Down
2 changes: 1 addition & 1 deletion contrib/lua/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ project "lua-lib"
"etc/*.c"
}

filter "system:linux or bsd or hurd or aix"
filter "system:linux or bsd or hurd or aix or solaris"
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }

filter "system:macosx"
Expand Down
2 changes: 1 addition & 1 deletion premake4.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
linkoptions { "-mmacosx-version-min=10.4" }

configuration { "solaris" }
linkoptions { "-Wl,--export-dynamic" }
links { "m", "socket", "nsl" }

configuration "aix"
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
Expand Down
2 changes: 1 addition & 1 deletion premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
toolset "clang"

filter { "system:solaris" }
linkoptions { "-Wl,--export-dynamic" }
links { "m", "socket", "nsl" }

filter "system:aix"
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
Expand Down