Updated SPDX license. Patched CFLAGS and LDFLAGS. Added glibc dependency.

3 files changed, 35 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6c0fd63c952..0c5a6a18c78c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libcs50-git
 	pkgdesc = CS50 Library for C (development version)
 	pkgver = 11.0.2.r0.g6d916ef
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/cs50/libcs50
 	install = libcs50.install
 	arch = x86_64
@@ -9,12 +9,15 @@ pkgbase = libcs50-git
 	groups = cs50
 	license = GPL-3.0-only
 	makedepends = git
+	depends = glibc
 	optdepends = clang: compiler currently used in CS50x course (2023)
 	provides = libcs50
 	conflicts = libcs50
 	source = git+https://github.com/cs50/libcs50.git#branch=main
 	source = Makefile.patch
+	source = Makefile-FLAGS.patch
 	sha256sums = SKIP
 	sha256sums = 4a10efd4f4f6b6bb18152a4f28497f7f8562aaa5aaf50c401d308827b922ef3f
+	sha256sums = 777a4af1f33c47eb5bc28b32153603928325b19dd705613d97eaf822e7123752
 
 pkgname = libcs50-git
diff --git a/Makefile-FLAGS.patch b/Makefile-FLAGS.patch
new file mode 100644
index 000000000000..19e3326a9452
--- /dev/null
+++ b/Makefile-FLAGS.patch
@@ -0,0 +1,22 @@
+--- Makefile	2024-01-17 16:45:50.820032476 +0200
++++ Makefile.old	2024-01-17 16:50:35.989535760 +0200
+@@ -9,7 +9,7 @@
+ INCLUDE := src/cs50.h
+ MANS := $(wildcard docs/*.3.gz)
+ 
+-CFLAGS=-Wall -Wextra -Werror -pedantic -std=c11
++CFLAGS+=-Wall -Wextra -Werror -pedantic -std=c11
+ BASENAME=libcs50
+ LIB_STATIC=$(BASENAME).a
+ LIB_OBJ=$(BASENAME).o
+@@ -36,8 +36,8 @@
+ all: $(LIBS) $(MANS)
+ 
+ $(LIBS): $(SRC) $(INCLUDE) Makefile
+-	$(CC) $(CFLAGS) -fPIC -shared $(LINKER_FLAGS) -o $(LIB_VERSION) $(SRC)
+-	$(CC) $(CFLAGS) -c -o $(LIB_OBJ) $(SRC)
++	$(CC) $(CFLAGS) -fPIC -shared $(LINKER_FLAGS) -o $(LIB_VERSION) $(SRC) ${LDFLAGS}
++	$(CC) $(CFLAGS) -c -o $(LIB_OBJ) $(SRC) $(LDFLAGS)
+ 	ar rcs $(LIB_STATIC) $(LIB_OBJ)
+ 	chmod 644 $(LIB_STATIC)
+ 	rm -f $(LIB_OBJ)
diff --git a/PKGBUILD b/PKGBUILD
index 3ffb3d7c8557..9ac4b8874dd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,13 @@
 pkgname='libcs50-git'
 _gitname='libcs50'
 pkgver=11.0.2.r0.g6d916ef
-pkgrel=2
+pkgrel=3
 pkgdesc="CS50 Library for C (development version)"
 arch=('x86_64' 'i686')
 url="https://github.com/cs50/libcs50"
 license=('GPL-3.0-only')
 groups=('cs50')
+depends=('glibc')
 makedepends=('git')
 optdepends=('clang: compiler currently used in CS50x course (2023)')
 provides=("${_gitname}")
@@ -19,11 +20,11 @@ conflicts=("${_gitname}")
 source=(
   'git+https://github.com/cs50/libcs50.git#branch=main'
   'Makefile.patch'
+  'Makefile-FLAGS.patch'
 )
-sha256sums=(
-  'SKIP'
-  '4a10efd4f4f6b6bb18152a4f28497f7f8562aaa5aaf50c401d308827b922ef3f'
-)
+sha256sums=('SKIP'
+            '4a10efd4f4f6b6bb18152a4f28497f7f8562aaa5aaf50c401d308827b922ef3f'
+            '777a4af1f33c47eb5bc28b32153603928325b19dd705613d97eaf822e7123752')
 install=libcs50.install
 
 pkgver() {
@@ -36,15 +37,14 @@ prepare() {
   cd "${_gitname}"
 
   patch < "${srcdir}/Makefile.patch"
-#  patch < "${srcdir}/Makefile-CFLAGS.patch"
+  patch < "${srcdir}/Makefile-FLAGS.patch"
 }
 
 build() {
   cd "${_gitname}"
-
   # TODO: Get this fixed upstream. We should not have to unset our $CFLAGS and
   #       $MAKEFLAGS.
-  CFLAGS= MAKEFLAGS= make
+#  CFLAGS= MAKEFLAGS= make
   make
 }
 
@@ -53,7 +53,7 @@ package() {
 
   # TODO: Get this fixed upstream. We should not have to unset our $CFLAGS and
   #       $MAKEFLAGS.
-  CCFLAGS= MAKEFLAGS= DESTDIR="${pkgdir}/usr" make install
+#  CCFLAGS= MAKEFLAGS= DESTDIR="${pkgdir}/usr" make install
   DESTDIR="${pkgdir}/usr" make install
 
   rm "${pkgdir}/usr/src/cs50.c"