Skip to content

Commit 28ab11a

Browse files
saudetsaudet
committed
Fix builds for ARPACK-NG and Leptonica
1 parent ed33b5c commit 28ab11a

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎arpack-ng/platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<!-- <artifactId>${javacpp.moduleId}</artifactId>-->
6161
<!-- <version>${project.version}</version>-->
6262
<!-- <classifier>${javacpp.platform.linux-ppc64le}</classifier>-->
63-
</dependency>
63+
<!-- </dependency>-->
6464
<dependency>
6565
<groupId>${project.groupId}</groupId>
6666
<artifactId>${javacpp.moduleId}</artifactId>

‎leptonica/cppbuild.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ case $PLATFORM in
108108
make -j $MAKEJ
109109
make install
110110
cd ../$LIBTIFF
111-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
111+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
112112
make -j $MAKEJ
113113
make install
114114
cd ../openjpeg-$OPENJPEG_VERSION
@@ -153,7 +153,7 @@ case $PLATFORM in
153153
make -j $MAKEJ
154154
make install
155155
cd ../$LIBTIFF
156-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
156+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
157157
make -j $MAKEJ
158158
make install
159159
cd ../openjpeg-$OPENJPEG_VERSION
@@ -197,7 +197,7 @@ case $PLATFORM in
197197
make -j $MAKEJ
198198
make install
199199
cd ../$LIBTIFF
200-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
200+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
201201
make -j $MAKEJ
202202
make install
203203
cd ../openjpeg-$OPENJPEG_VERSION
@@ -241,7 +241,7 @@ case $PLATFORM in
241241
make -j $MAKEJ
242242
make install
243243
cd ../$LIBTIFF
244-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
244+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
245245
make -j $MAKEJ
246246
make install
247247
cd ../openjpeg-$OPENJPEG_VERSION
@@ -282,7 +282,7 @@ case $PLATFORM in
282282
make -j $MAKEJ
283283
make install
284284
cd ../$LIBTIFF
285-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
285+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
286286
make -j $MAKEJ
287287
make install
288288
cd ../openjpeg-$OPENJPEG_VERSION
@@ -323,7 +323,7 @@ case $PLATFORM in
323323
make -j $MAKEJ
324324
make install
325325
cd ../$LIBTIFF
326-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
326+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
327327
make -j $MAKEJ
328328
make install
329329
cd ../openjpeg-$OPENJPEG_VERSION
@@ -368,7 +368,7 @@ case $PLATFORM in
368368
make -j $MAKEJ
369369
make install
370370
cd ../$LIBTIFF
371-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
371+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
372372
make -j $MAKEJ
373373
make install
374374
cd ../openjpeg-$OPENJPEG_VERSION
@@ -410,7 +410,7 @@ case $PLATFORM in
410410
make -j $MAKEJ
411411
make install
412412
cd ../$LIBTIFF
413-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
413+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
414414
make -j $MAKEJ
415415
make install
416416
cd ../openjpeg-$OPENJPEG_VERSION
@@ -452,7 +452,7 @@ case $PLATFORM in
452452
make -j $MAKEJ
453453
make install
454454
cd ../$LIBTIFF
455-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
455+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
456456
make -j $MAKEJ
457457
make install
458458
cd ../openjpeg-$OPENJPEG_VERSION
@@ -493,7 +493,7 @@ case $PLATFORM in
493493
make -j $MAKEJ
494494
make install
495495
cd ../$LIBTIFF
496-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
496+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
497497
make -j $MAKEJ
498498
make install
499499
cd ../openjpeg-$OPENJPEG_VERSION
@@ -533,7 +533,7 @@ case $PLATFORM in
533533
make -j $MAKEJ
534534
make install
535535
cd ../$LIBTIFF
536-
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
536+
$CMAKE $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
537537
make -j $MAKEJ
538538
make install
539539
cd ../openjpeg-$OPENJPEG_VERSION
@@ -573,7 +573,7 @@ case $PLATFORM in
573573
make -j $MAKEJ
574574
make install
575575
cd ../$LIBTIFF
576-
$CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
576+
$CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
577577
make -j $MAKEJ
578578
make install
579579
cd ../openjpeg-$OPENJPEG_VERSION
@@ -613,7 +613,7 @@ case $PLATFORM in
613613
make -j $MAKEJ
614614
make install
615615
cd ../$LIBTIFF
616-
$CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
616+
$CMAKE -G "MSYS Makefiles" $CMAKE_CONFIG -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dlibdeflate=OFF -Djbig=OFF -Dlzma=OFF -Dzstd=OFF .
617617
make -j $MAKEJ
618618
make install
619619
cd ../openjpeg-$OPENJPEG_VERSION

0 commit comments

Comments
 (0)