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

3 files changed, 35 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d7c5766bbb4..3dcfb37eeeba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = libcs50
 	pkgdesc = CS50 Library for C
 	pkgver = 11.0.2
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/cs50/libcs50
 	install = libcs50.install
 	arch = i686
 	arch = x86_64
 	groups = cs50
 	license = GPL-3.0-only
+	depends = glibc
 	optdepends = clang: compiler currently used in CS50x course (2023)
 	conflicts = libcs50-git
 	source = libcs50-11.0.2.tar.gz::https://github.com/cs50/libcs50/archive/v11.0.2.tar.gz
 	source = Makefile.patch
+	source = Makefile-FLAGS.patch
 	sha256sums = 3439547f7a73cae96d9208c24bbd1f6e7cf055acaba6ac30362e8f32fd521e36
 	sha256sums = 4a10efd4f4f6b6bb18152a4f28497f7f8562aaa5aaf50c401d308827b922ef3f
+	sha256sums = 777a4af1f33c47eb5bc28b32153603928325b19dd705613d97eaf822e7123752
 
 pkgname = libcs50
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 0b4da9e9fe99..937f124526ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,42 +6,41 @@
 
 pkgname='libcs50'
 pkgver=11.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="CS50 Library for C"
 arch=('i686' 'x86_64')
 url='https://github.com/cs50/libcs50'
 license=('GPL-3.0-only')
+depends=('glibc')
 optdepends=('clang: compiler currently used in CS50x course (2023)')
 groups=('cs50')
 conflicts=('libcs50-git')
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/cs50/${pkgname}/archive/v${pkgver}.tar.gz"
   'Makefile.patch'
+  'Makefile-FLAGS.patch'
 )
 sha256sums=('3439547f7a73cae96d9208c24bbd1f6e7cf055acaba6ac30362e8f32fd521e36'
-            '4a10efd4f4f6b6bb18152a4f28497f7f8562aaa5aaf50c401d308827b922ef3f')
+            '4a10efd4f4f6b6bb18152a4f28497f7f8562aaa5aaf50c401d308827b922ef3f'
+            '777a4af1f33c47eb5bc28b32153603928325b19dd705613d97eaf822e7123752')
 install=libcs50.install
 
 prepare() {
   cd "${pkgname}-${pkgver}"
 
   patch < "${srcdir}/Makefile.patch"
+  patch < "${srcdir}/Makefile-FLAGS.patch"
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
-
-  # TODO: Get this fixed upstream. We should not have to unset our $CFLAGS and
-  #       $MAKEFLAGS.
-  CFLAGS= MAKEFLAGS= make
+  make
 }
 
 package() {
   cd "${pkgname}-${pkgver}"
-
-  # TODO: Get this fixed upstream. We should not have to unset our $CFLAGS and
-  #       $MAKEFLAGS.
-  CFLAGS= MAKEFLAGS= DESTDIR="${pkgdir}/usr" make install
+  
+  DESTDIR="${pkgdir}/usr" make install
   rm "${pkgdir}/usr/src/cs50.c"
   install -d -m 755 "${pkgdir}/usr/src/libcs50"
   install -m 644 src/cs50.c src/cs50.h -t "${pkgdir}/usr/src/libcs50"