Skip to content

Commit 15e6443

Browse files
committed
try fix for R 4.5 WIN again
1 parent 7db5d13 commit 15e6443

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/Makevars.win

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# Tesseract configuration
22
RWINLIB = ../windows/tesseract
3-
PKG_CPPFLAGS = -I${RWINLIB}/include -I${RWINLIB}/include/leptonica -fvisibility=hidden
3+
PKG_CPPFLAGS = -I${RWINLIB}/include -I${RWINLIB}/include/leptonica -fvisibility=hidden -fvisibility-inlines-hidden
44

55
# Basic library configuration
66
PKG_LIBS = -L${RWINLIB}/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
77
-L${RWINLIB}/lib
88

99
# R 4.5.0 requires special handling for symbol visibility
1010
ifeq ($(shell ${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe -e 'cat(as.numeric(R.version$$major) + as.numeric(R.version$$minor)/10)'),4.5)
11-
# For R 4.5.0, use explicit DEF file and extra symbol hiding
1211
PKG_LIBS += -ltesseract -lleptonica -ltiff -lopenjp2 -lwebp -lwebpmux -lwebpdemux -lsharpyuv -ljpeg -lgif -lpng16 -lz \
1312
-lws2_32 -lgdi32 -Wl,--exclude-all-symbols -static-libgcc -static-libstdc++ \
14-
-Wl,--output-def,cpp11tesseract.def
13+
-Wl,--output-def,cpp11tesseract.def -Wl,--no-undefined -Wl,--kill-at -Wl,--enable-runtime-pseudo-reloc
1514
else
1615
# For earlier R versions, use the standard approach
1716
PKG_LIBS += -Wl,--whole-archive -ltesseract -Wl,--no-whole-archive \

tools/export.map

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)