fix configure

Zilong-Li · Zilong-Li · commit fb156e8f619b · 2024-12-14T21:39:20.000+01:00
diff --git a/configure b/configure
@@ -2,4 +2,4 @@
 
 HTSLIB_DIR="src/htslib-1.21"
 echo "Configuring HTSlib in $HTSLIB_DIR"
-cd $HTSLIB_DIR && ./configure && make
+cd $HTSLIB_DIR && ./configure --enable-static --disable-shared --without-libdeflate && make
diff --git a/src/Makevars b/src/Makevars
@@ -1,6 +1,6 @@
 HTSLIB_DIR='htslib-1.21'
 PKG_CPPFLAGS = -I${HTSLIB_DIR} -I../inst/include
-PKG_LIBS = ${HTSLIB_DIR}/libhts.a -fPIC -lz -lm -lbz2 -llzma -lcurl
+PKG_LIBS = ${HTSLIB_DIR}/libhts.a -lz -lm -lbz2 -llzma -lcurl
 
 .PHONY: all clean 
 
diff --git a/src/htslib-1.21/htscodecs/htscodecs/fqzcomp_qual.c b/src/htslib-1.21/htscodecs/htscodecs/fqzcomp_qual.c
@@ -270,7 +270,7 @@ static void dump_map(unsigned int *map, int size, char *name) {
     fprintf(stderr, "}\n");
 }
 
-#pragma GCC diagnostic ignored "-Wunused-function"
+/* #pragma GCC diagnostic ignored "-Wunused-function" */
 static void dump_params(fqz_gparams *gp) {
     fprintf(stderr, "Global params = {\n");
     fprintf(stderr, "\tvers\t%d\n", gp->vers);

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ static void dump_map(unsigned int map, int size, char name) {`
`270`	`270`	`fprintf(stderr, "}\n");`
`271`	`271`	`}`
`272`	`272`
`273`		`-#pragma GCC diagnostic ignored "-Wunused-function"`
	`273`	`+/* #pragma GCC diagnostic ignored "-Wunused-function" */`
`274`	`274`	`static void dump_params(fqz_gparams *gp) {`
`275`	`275`	`fprintf(stderr, "Global params = {\n");`
`276`	`276`	`fprintf(stderr, "\tvers\t%d\n", gp->vers);`