Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
c807917e
Commit
c807917e
authored
6 months ago
by
Ariadne Conill
Browse files
Options
Downloads
Patches
Plain Diff
testing/hdf4: build with libtirpc, hackfixes for GCC 14
parent
461bebc7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
testing/hdf4/APKBUILD
+8
-4
8 additions, 4 deletions
testing/hdf4/APKBUILD
testing/hdf4/gcc14.patch
+72
-0
72 additions, 0 deletions
testing/hdf4/gcc14.patch
with
80 additions
and
4 deletions
testing/hdf4/APKBUILD
+
8
−
4
View file @
c807917e
...
@@ -2,13 +2,13 @@
...
@@ -2,13 +2,13 @@
# Maintainer: Edd Salkield <edd@salkield.uk>
# Maintainer: Edd Salkield <edd@salkield.uk>
pkgname
=
hdf4
pkgname
=
hdf4
pkgver
=
4.2.15
pkgver
=
4.2.15
pkgrel
=
1
pkgrel
=
2
pkgdesc
=
"Data model, library, and file format for storing and managing data"
pkgdesc
=
"Data model, library, and file format for storing and managing data"
url
=
"https://www.hdfgroup.org/solutions/hdf4/"
url
=
"https://www.hdfgroup.org/solutions/hdf4/"
arch
=
"all !riscv64"
# ftbfs
arch
=
"all !riscv64"
# ftbfs
license
=
"custom"
license
=
"custom"
options
=
"!check"
# Upstream tests appear broken
options
=
"!check"
# Upstream tests appear broken
depends_dev
=
"zlib-dev jpeg-dev
portablexdr
-dev"
depends_dev
=
"zlib-dev jpeg-dev
libtirpc
-dev"
makedepends
=
"
$depends_dev
bison flex libaec-dev chrpath"
makedepends
=
"
$depends_dev
bison flex libaec-dev chrpath"
checkdepends
=
"diffutils"
# Flags not supported by busybox diff are used
checkdepends
=
"diffutils"
# Flags not supported by busybox diff are used
subpackages
=
"
$pkgname
-dev
$pkgname
-doc
$pkgname
-tools"
subpackages
=
"
$pkgname
-dev
$pkgname
-doc
$pkgname
-tools"
...
@@ -21,7 +21,8 @@ source="https://support.hdfgroup.org/ftp/HDF/releases/HDF$pkgver/src/hdf-$pkgver
...
@@ -21,7 +21,8 @@ source="https://support.hdfgroup.org/ftp/HDF/releases/HDF$pkgver/src/hdf-$pkgver
40-hdf-arm.patch
40-hdf-arm.patch
50-hdf-aarch64.patch
50-hdf-aarch64.patch
60-hdf-ppc64le.patch
60-hdf-ppc64le.patch
70-hdf-loongarch64.patch"
70-hdf-loongarch64.patch
gcc14.patch"
builddir
=
"
$srcdir
"
/hdf-
"
$pkgver
"
builddir
=
"
$srcdir
"
/hdf-
"
$pkgver
"
prepare
()
{
prepare
()
{
...
@@ -38,7 +39,9 @@ build() {
...
@@ -38,7 +39,9 @@ build() {
# > export FFLAGS="$FFLAGS -fallow-argument-mismatch"
# > export FFLAGS="$FFLAGS -fallow-argument-mismatch"
# However, --enable-shared currently requires that fortran is disabled, so
# However, --enable-shared currently requires that fortran is disabled, so
# it doesn't matter anyway
# it doesn't matter anyway
export
LIBS
=
"
$LIBS
-lportablexdr"
export
CFLAGS
=
"
$CFLAGS
-Wno-implicit-function-declaration -Wno-implicit-int -Wno-incompatible-pointer-types"
export
CPPFLAGS
=
"
$CPPFLAGS
-I/usr/include/tirpc"
export
LIBS
=
"
$LIBS
-ltirpc"
# We disable netcdf since it's provided by the netcdf-* packages
# We disable netcdf since it's provided by the netcdf-* packages
./configure
\
./configure
\
...
@@ -116,4 +119,5 @@ b9ea7c626fcf1bfbf75e05459794fc577a28602749464f2eea029fc4d729ceeb96f93273cc9ea898
...
@@ -116,4 +119,5 @@ b9ea7c626fcf1bfbf75e05459794fc577a28602749464f2eea029fc4d729ceeb96f93273cc9ea898
fac62b5ab9ceaf9ddd9cc4831994cdf5cc4e0b2f85ee9f943f7311b0acc2b78d18f49e194a31b7ddd0c17dc87a14ec55d6af73258fbc2f0f2e2b86b7f9048f25 50-hdf-aarch64.patch
fac62b5ab9ceaf9ddd9cc4831994cdf5cc4e0b2f85ee9f943f7311b0acc2b78d18f49e194a31b7ddd0c17dc87a14ec55d6af73258fbc2f0f2e2b86b7f9048f25 50-hdf-aarch64.patch
824be68ce54c43ea8e556cd9836b8d18162e3a214d532ce40ca7de600693da89dcbc364aae5995c2cd455126550d88606889c5e1c956c4cb9f1928566c705121 60-hdf-ppc64le.patch
824be68ce54c43ea8e556cd9836b8d18162e3a214d532ce40ca7de600693da89dcbc364aae5995c2cd455126550d88606889c5e1c956c4cb9f1928566c705121 60-hdf-ppc64le.patch
9e3c9f726c2ee9bd29a70211c91a5b6afa6bcc26708cfa2fe844ba2f3a2e69587cff028cca73febe83dd8fea62ad9abee52c301de301e2d9f4d77dbfdee8f293 70-hdf-loongarch64.patch
9e3c9f726c2ee9bd29a70211c91a5b6afa6bcc26708cfa2fe844ba2f3a2e69587cff028cca73febe83dd8fea62ad9abee52c301de301e2d9f4d77dbfdee8f293 70-hdf-loongarch64.patch
8c07bb9c0a185720879d24037f252686686133ebd4fed1e36caddc36e4be40f894b2a56c41fc4ffb09dae14f013a66bf1bbbae1980ab2c9aef86e7a53ec5f0e3 gcc14.patch
"
"
This diff is collapsed.
Click to expand it.
testing/hdf4/gcc14.patch
0 → 100644
+
72
−
0
View file @
c807917e
--- hdf-4.2.15.orig/hdf/test/buffer.c
+++ hdf-4.2.15/hdf/test/buffer.c
@@ -46,6 +46,7 @@
#define TESTMASTER
+#include <time.h>
#include "hdf.h"
#ifdef H4_HAVE_SYS_TIME_H
#include <sys/time.h>
--- hdf-4.2.15.orig/hdf/util/he_file.c
+++ hdf-4.2.15/hdf/util/he_file.c
@@ -17,9 +17,7 @@
#include "he.h"
/* get the prototype for the wait() func. */
-#if defined SUN | defined HP9000 | defined IRIX | defined UNIX386
#include <sys/wait.h>
-#endif /* SUN | HP9000 */
#ifdef H4_HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -125,7 +123,7 @@
if (fork() == 0)
{
/* this is the child */
- if (execl(editor, editor, file, 0) == -1)
+ if (execl(editor, editor, file, NULL) == -1)
fprintf(stderr, "Error while editing label.\n");
/* return control to the parent if exec fails
@@ -134,7 +132,7 @@
}
/* the parent waits for the child to die */
- wait(0);
+ wait(NULL);
#elif defined(H4_HAVE_SYSTEM)
{ char cmd[256];
if (HDstrlen(editor) > 100) {
--- hdf-4.2.15.orig/mfhdf/libsrc/file.c
+++ hdf-4.2.15/mfhdf/libsrc/file.c
@@ -20,6 +20,7 @@
#include <assert.h>
#endif /* DEBUG */
+#include <unistd.h>
#include <string.h>
#include <errno.h>
#include "local_nc.h"
--- hdf-4.2.15.orig/mfhdf/test/hdftest.c
+++ hdf-4.2.15/mfhdf/test/hdftest.c
@@ -59,7 +59,7 @@
extern int test_coordvar();
extern int test_chunk();
extern int test_compression();
-extern int test_dimension();
+extern int test_dimensions();
extern int test_attributes();
extern int test_datasizes();
extern int test_datainfo();
--- hdf-4.2.15.orig/mfhdf/test/tncvargetfill.c
+++ hdf-4.2.15/mfhdf/test/tncvargetfill.c
@@ -33,6 +33,8 @@
#include "mfhdf.h"
#include "hdftest.h"
+extern int verify_info_data(int32 sds_id, int32 expected_dimsize, int16 *result);
+
#define DIM0 20 /* this value is used to declare larger buffer for when
reading past the maximum number of records in the file */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment