Skip to content

Commit

Permalink
maybe working on R 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
paleolimbot committed Jun 6, 2024
1 parent c58eacd commit 5d8f9d0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 21 deletions.
6 changes: 6 additions & 0 deletions configure.win
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

if pkg-config --version 2>/dev/null; then
exit 0;
fi

WIN_CPPFLAGS="-DABSL_FORCE_WAITER_MODE=4" tools/build_absl.sh
23 changes: 6 additions & 17 deletions src/Makevars.ucrt
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@

ifeq (,$(shell pkg-config absl_base --cflags))
ABSL_CFLAGS = -I../tools/dist/include
else
ABSL_CFLAGS =
endif

ABSL_LIBS = -L..tools/dist/lib -labsl_cord -labsl_cordz_info -labsl_cord_internal -labsl_cordz_functions -labsl_cordz_handle -labsl_crc_cord_state -labsl_crc32c -labsl_crc_internal -labsl_crc_cpu_detect -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_exponential_biased -labsl_synchronization -labsl_graphcycles_internal -labsl_kernel_timeout_internal -labsl_stacktrace -labsl_symbolize -labsl_malloc_internal -labsl_time -labsl_civil_time -labsl_time_zone -labsl_hash -labsl_city -labsl_bad_optional_access -labsl_bad_variant_access -labsl_low_level_hash -labsl_str_format_internal -labsl_strings -labsl_string_view -labsl_strings_internal -labsl_int128 -labsl_throw_delegate -labsl_demangle_internal -labsl_base -labsl_spinlock_wait -labsl_debugging_internal -labsl_raw_logging_internal -labsl_log_severity

PKG_CPPFLAGS = $(ABSL_CFLAGS) -DSTRICT_R_HEADERS -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME -I../src

ABSL_LIBS = -labsl_cord -labsl_cordz_info -labsl_cord_internal -labsl_cordz_functions -labsl_cordz_handle -labsl_crc_cord_state -labsl_crc32c -labsl_crc_internal -labsl_crc_cpu_detect -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_exponential_biased -labsl_synchronization -labsl_graphcycles_internal -labsl_kernel_timeout_internal -labsl_stacktrace -labsl_symbolize -labsl_malloc_internal -labsl_time -labsl_civil_time -labsl_time_zone -labsl_hash -labsl_city -labsl_bad_optional_access -labsl_bad_variant_access -labsl_low_level_hash -labsl_str_format_internal -labsl_strings -labsl_string_view -labsl_strings_internal -labsl_int128 -labsl_throw_delegate -labsl_demangle_internal -labsl_base -labsl_spinlock_wait -labsl_debugging_internal -labsl_raw_logging_internal -labsl_log_severity

ifeq (,$(shell pkg-config --version 2>/dev/null))
PKG_LIBS = -Ls2 -ls2static $(ABSL_LIBS) -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32
ABSL_CFLAGS = -I../tools/dist/include
PKG_LIBS = -Ls2 -ls2static -L../tools/dist/lib $(ABSL_LIBS) -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32 -limagehlp
else
PKG_LIBS = -Ls2 -ls2static $(ABSL_LIBS) $(shell pkg-config --libs openssl)
endif

PKG_CPPFLAGS = $(ABSL_CFLAGS) -DSTRICT_R_HEADERS -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME -I../src

CXX_STD = CXX17

STATLIB = s2/libs2static.a
Expand Down Expand Up @@ -131,14 +125,9 @@ $(SHLIB): $(STATLIB)

$(STATLIB): $(S2LIBS)

$(S2LIBS): winlibs

#all: clean

winlibs:
cd .. && pwd

clean:
rm -f $(SHLIB) $(STATLIB) $(OBJECTS) $(S2LIBS)

.PHONY: all winlibs clean
.PHONY: all clean
8 changes: 4 additions & 4 deletions tools/build_absl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ if test -z "${R_HOME}"; then
fi

CC=`"${R_HOME}/bin/R" CMD config CC`
CXX="`${R_HOME}/bin/R CMD config CXX14` `${R_HOME}/bin/R CMD config CXX14STD`"
CXX="`${R_HOME}/bin/R CMD config CXX17` `${R_HOME}/bin/R CMD config CXX17STD`"
CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
R_CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
R_CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXX14FLAGS`
R_CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXX17FLAGS`
LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`

CMAKE_INSTALL_PREFIX="`pwd`/tools/dist"
Expand All @@ -45,13 +45,13 @@ ${CMAKE} \
-G "Unix Makefiles" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_CXX_FLAGS_RELEASE="${R_CPPFLAGS} ${R_CXXFLAGS}" \
-DCMAKE_CXX_FLAGS_RELEASE="${R_CPPFLAGS} ${R_CXXFLAGS} ${WIN_CPPFLAGS}" \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" \
-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.3 \
-DCMAKE_CXX_STANDARD=14 \
-DCMAKE_CXX_STANDARD=17 \
-DABSL_PROPAGATE_CXX_STD=ON \
"../../vendor/abseil-cpp" &&
${MAKE} ${MAKEVARS} &&
Expand Down

0 comments on commit 5d8f9d0

Please sign in to comment.